blah
Merge branch 'master' of https://github.com/CrossTheStreams/music_bubble into kbrwn
Merge branch 'master' of https://github.com/CrossTheStreams/music_bubble into kbrwn

Conflicts:
	app/views/layouts/application.haml
hi
Merge branch 'master' of https://github.com/CrossTheStreams/music_bubble into kbrwn
Merge branch 'master' of https://github.com/CrossTheStreams/music_bubble into kbrwn
andrew is awesome
andrew is awesome
Merge branch 'kbrwn'