functional map that bounces
google map is dropping icons now
Merge branch 'bouncymap' of https://github.com/tleung999/simplicity
merge google map drop markers
complete google map module
merge with alex and kendall updates
Tuesday night merge
Informalizes HelloUser module by displaying first name only
Merge pull request #49 from tleung999/Hellofix

Informalizes HelloUser module by displaying first name only
Merge pull request #48 from tleung999/tuesday_night

Tuesday night
Merge branch 'master' of https://github.com/tleung999/simplicity into betterSong

Conflicts:
	public/index.html