slow update
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
Merge branch 'master' into Jia
readded gmap
Merge branch 'master' into Jia