changes to the user model
Merge branch 'master' of https://github.com/tcb-hr/feed into search
file upload
file uplaod almost
this merge mess is a place
Merge pull request #16 from janaspage/master

Scroll-fix #2
everything but the file uploads
Basic leaflet map (and commented out Instagram/Sockets)
Merge branch 'master' into serversockets

Conflicts:
	app/views/partials/main.html
Merge pull request #17 from tcb-hr/serversockets

Basic leaflet map (and commented out Instagram/Sockets)
Added z-index to map
Map marker created using hard-coded location object
Merge branch 'search' of https://github.com/tcb-hr/feed
upload routing
Posts/Receives geocoding from mapquest for single location
Batch geocoding
Promises
Geocoded maps (Bug: keeps assigning same lat/lon coordinates)
Completed maps w/ color-coded markers
Merge pull request #18 from tcb-hr/fixMap

Completed maps w/ color-coded markers