premerge
Merge branch 'master' of https://github.com/GraemeEArthur/MapMyPlaylist

Conflicts:
	MapMyPlaylist/mapfrontend/static/js/artistmapping.js
	MapMyPlaylist/mapper
Popups and marker css and styling
Merge branch 'master' of https://github.com/GraemeEArthur/MapMyPlaylist

Conflicts:
	MapMyPlaylist/mapfrontend/static/js/artistmapping.js
	MapMyPlaylist/mapfrontend/templates/MMP_mainpage.html
	MapMyPlaylist/mapfrontend/templates/MMP_user.html
	MapMyPlaylist/mapper
Merge branch 'master' of https://github.com/GraemeEArthur/MapMyPlaylist

Conflicts:
	MapMyPlaylist/mapper
Added users to DB.