commit
Merge branch 'master' of https://github.com/Metrakit/larabb

Conflicts:
	dist/css/main.min.css