updated map Controller which drops all pins (yay)
Merge pull request #48 from tiger-swallowtails-2014/map_controller_KY_JT

updated map Controller which drops all pins (yay)

Reviewed _dropPinables function:  calls mapIntoGoogleLatLong on each musician, iterates through the array and sets markers for each.
Move to when/then
Merge pull request #49 from tiger-swallowtails-2014/sgh-add-asynchronous-promise-means-for-passing-to-map-controller

Move to when/then
per discussion; much gratitude - Kelly
updated map Controller which drops all pins (yay)
Move to when/then
event listeners on pins;updates to prepare for rendering of profiles
Merge branch 'master' into map_controller_KY_JT
Resolve merge conflict

Conflicts:
	app/assets/javascripts/mapController.js
Merge branch 'map_controller_KY_JT'
Resolve merge... conflict?
added marker icon
added marker imgs for surrent user and orther users
Merge pull request #51 from tiger-swallowtails-2014/SC-map-markers

Sc map markers
Consistent with design discussions on color/style; merged. Kelly
add render for display profile
add jquery animation to display profile for other musician
add jquery animation to display profile for current musician
Merge pull request #52 from tiger-swallowtails-2014/display_user_profile_KY_SC

Display user profile ky sc

Worked on displaying user template on click and added jquery animation
re-added icons for current user and orther musicians
Merge pull request #53 from tiger-swallowtails-2014/SC-map-markers

re-added icons for current user and orther musicians
fixes overwriting on icons; merging. Kelly
formatting clean_up
Fix musician#show rspec test, now passes