Initial commit
created django app
Made the basic layout of the main screen
Merge pull request #1 from IanChar/map

Made the basic layout of the main screen
Now when you click somewhere on a map a marker is added
added users database. can login and register
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
Got some marker highlight info going
Merge pull request #3 from IanChar/marker

Got some marker highlight info going
Created song database, allows users to add songs, populated default database
Got SoundCloud player to appear when a marker is clicked
Merge pull request #4 from IanChar/iansBranch

Got SoundCloud player to appear when a marker is clicked
Animations to markers, changes some colors, added demo markers
Merge pull request #5 from IanChar/iansBranch

Animations to markers, changes some colors, added demo markers
Played around with some CSS stuff
Fixed problem having to do with z-index
Merge pull request #6 from IanChar/iansBranch

Ians branch