Now when you click somewhere on a map a marker is added
Merge branch 'master' into map
Can now place a marker or get current location
Merge branch 'master' of https://github.com/IanChar/soundscape

Conflicts:
	soundscape_project/static/map.js
Merged branches successfully