Merge branch 'master' into beta

.gitlab-ci.yml

+# specify what docker image
+# go with the default image for now and mangle it
+#image: ruby:2.1
+
+stages:
+  - test
+  - deploy
+
+# make sure php is in the image
+before_script:
+   - apt-get clean
+   - apt-get update
+   - apt-get install -y php5-cli
+
+php-syntax-check:
+  stage: test
+  script:
+   - php -l htdocs/index.php
+   - find components | xargs -n 1 php -l
+   - find plugins | xargs -n 1 php -l
+   - find lib | xargs -n 1 php -l
+  
+fake-deploy-beta:
+  stage: deploy
+  script:
+   - echo "Hello World!"
+  only:
+   - beta
+
+fake-deploy-live:
+  stage: deploy
+  script:
+   - echo "Hello World!"
+  only:
+   - sucs-site
\ No newline at end of file

README.md

 # SUCS Site
+[![build status](https://projects.sucs.org/ci/projects/2/status.png?ref=master)](https://projects.sucs.org/ci/projects/2?ref=master)
+
 ---
 ## Project Structure
 <br>