Adding Models
Models added
move city File
move scaling to city file
Merge branch 'master' of github.com:vanjoe/eece478

Conflicts:
	a3/main.c
buildings done, now going through city