Updated README.
Merge branch 'master' of https://github.com/meyersbs/swen250

Conflicts:
	README.md