updated map styles
Merge pull request #14 from hartsick/master

google map stylized
Merge pull request #15 from hartsick/user

Merge pull request #14 from hartsick/master
map stylized with off-canvas menu
Merge branch 'user' of github.com:hartsick/pLAy-music into user
Merge pull request #16 from hartsick/user

User
Merge branch 'master' into generate-playlist

Conflicts:
	app/views/layouts/_nav.html.erb