commit test
Merge remote-tracking branch 'origin/master'

Conflicts:
	CS410 Project/src/main/Parser.java
Merge branch 'master' of https://github.com/yolandaw/CS410.git

Conflicts:
	CS410 Project/src/main/Parser.java
Merge branch 'master' of https://github.com/yolandaw/CS410.git

Conflicts:
	CS410 Project/src/main/CityModel.java
	CS410 Project/src/main/Main.java