Merged.
Merge branch 'master' of https://github.com/software-engineering-amsterdam/Master-projects-2013-2014

Conflicts:
	README.md