more edits to the readme
Merge branch 'master' of https://github.com/CSC309-SoftwareEngineering/Marccello

Conflicts:
	log/development.log
Changes to readme again