slow update
fixing bug
fixing bug
fixing bug
fixing bug
added width and height for google images
Merge branch 'master' into Simon
images -> image
put all image stuff into an array
actually did something; gimages.py
holy crap i made something that works
holy crap i made something that works
Merge branch 'Jia' of github.com:stuycs-softdev/proj2-pd6-08-JASE into Jia

Conflicts:
	gmap.py
reverting database
Merge branch 'master' into Jia
changes done in school
Map of all teachers
fixed merge issue
Added geocode,py
more bug fixing