Merge branch 'master' of https://github.com/luka454/PeekaBooCode

Conflicts:
	app/app.js