working on the dashboard
Merge branch 'front-end' into design
finished dashboard (for now)
geolocation functioning
Merge branch 'master' into front-end
got activities on dashboard working
merging
fix merge conflicts
stuff
merge with design
logout added
AAAAAAAAAAAHHHHHHHH
message route added
working on message page
fixed grunt error
getting messages working
for msg
stuff and things
message page done
multiple photo upload functionality for user model