Added a readme compatible with github
Merge branch 'master' of git.assembla.com:cmpsc483w-un

Conflicts:
	README.md