Merge branch 'master' of https://github.com/project-fifo/jingles into ticket-1
Changed some things

Conflicts:
	app/index.html
	app/scripts/app.js
merged