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

ý5:q
adding working JS for maps and FB-pic-form, nav bar still broken
merge conflicts
fixed friendship validations, added styling