first commit after planning
Merge branch 'master' of https://github.com/zephinzer/cs3213-assignment-0

Conflicts:
	test.txt