Changed README
Merge branch 'master' of https://github.com/agicsaki/CS2112A5

Conflicts:
	README.txt