HendrikKolver/COS301 — pull request #3 by HendrikKolver (2013-06-14 21:50:21+00:00)
Title: Merge scrum features into integration

Added some things to test on the server. not working 100%, don't merge into master until all bugs have been fixed