Merge pull request #1 from therewasaguy/master

added some tracks, more to come!
matching backend with message passing
Merge branch 'master' of https://github.com/tambien/MakeMeDance

Conflicts:
	client/scripts/app/songs/HipHop.js
	client/scripts/app/songs/PopSongs.js
added backend sync
Merge branch 'pr/2'

Conflicts:
	client/scripts/app/songs/EDM.js
	client/scripts/app/songs/HipHop.js
fixed json syntax
added curator feature
Merge branch 'pr/4'

Conflicts:
	client/scripts/app/songs/EDM.js
	client/scripts/app/songs/HipHop.js
updated the package to include web sockets
added procfile
listening slightly different. added engine
minimal app to test on heroku
Rename curators.js to Curators.js
revertttt
added author
updated web socket server and client for heroku
preparing to merge
preparing to merge