started on submitting songs
Merge branch 'master' of https://github.com/httpsters/ryze-espresso

Conflicts:
	client/index.html