adding stuff so i can switch branches
deleted gmap.js, some other things
Merge branch 'matthew'

ý5:q