f
Merge branch 'master' of https://github.com/chenzeyu/CS3213-HW1

Conflicts:
	src/inputGetter/inputGetter.java
finish