Dragster testing
Finished json file linking geoLocation to artists
homepage starter
Merge branch 'Front-End' of https://github.com/outsidehack/MyStory into Front-End
Sameer's work
Impressive changes to homepage
Merge branch 'Front-End'

Conflicts:
	views/assets/css/jquery.gridster.css
	views/assets/js/jquery.collision.js
	views/assets/js/jquery.coords.js
	views/assets/js/jquery.draggable.js
	views/assets/js/jquery.gridster.extras.js
	views/assets/js/jquery.gridster.js
	views/assets/js/utils.js