styling the updates page
fixing merge conflicts
adding javascript to display markers for each user update
fixing merge conflicts, removing likeButton.js replacing with likes.js
merging files
changing size of map and updates container
Merge branch 'map+video'
awesome styling going on and attempt and sliding profile
toggling / styling map markers and adding map category buttons
Merge branch 'map+video'
removing updateDisplayOnMap replaced with another js file
fixing merge conflicts
adding user location to the random test users
Merge branch 'master' of https://github.com/ahmedhawas/Hot-Spotter into map+video
adding profile pictures for fake users