Merge branch 'master' of github.com:newpatriks/Github-repo

Conflicts:
	js/app/router.js
	js/app/views/Home.js
merging