location
Merge branch 'master' of https://github.com/johaasi/High8

Conflicts:
	css/app.css
	js/app.js
	sidebar.html
Merge branch 'master' of https://github.com/johaasi/High8

Conflicts:
	js/app.js