reset local branch to master
Merge branch 'master' of https://github.com/adaam2/wherelionsroam

Conflicts:
	assets/css/wlr.css
	assets/scss/wlr.scss
	config.codekit