boostrap
merge
Merge branch 'master' of https://github.com/wolfgangihloff/apprendo

Conflicts:
	.idea/workspace.xml
	app/routes.php
	app/views/home.php