Moved towers to be stored in citymodel, updated drawing to be isometric,
added texture functionality, added y axis scrolling
changed floor vertexarray to use quads instead of triangles in order
to decrease number of vertices used
added textures to side and top of towers
Merge branch 'master' of https://github.com/yolandaw/CS410.git

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