added in the mayors to packages, also has the code for the parser
before the break
Merge branch 'master' of https://github.com/yolandaw/CS410.git

Conflicts:
	CS410 Project/src/main/CityModel.java
	CS410 Project/src/main/Main.java
	CS410 Project/src/main/Tower.java
Merge branch 'master' of https://github.com/yolandaw/CS410.git
just deleting some commented stuff