readme
Merge branch 'master' of https://github.com/boochu/485a-a1

Conflicts:
	README.txt