stuff
Merge branch 'master' of github.com:KATT/lectr

Conflicts:
	assets/css/app/lectr.css