4/24
Trying to merge?
forgot this guy
message
Merge branch 'master' of https://github.com/klgrimley/Grateful-Music

Conflicts:
	js/main.js