added tons of songs and curator json file
Update PopSongs.js
Merge pull request #1 from dothething/patch-1

Update PopSongs.js
Update EDM.js
Update HipHop.js
Merge pull request #3 from dothething/patch-3

Update HipHop.js
Merge pull request #2 from dothething/patch-2

Update EDM.js
Update HipHop.js
Update curators.js
Update curators.js
Merge branch 'pr/2'

Conflicts:
	client/scripts/app/songs/EDM.js
	client/scripts/app/songs/HipHop.js