Init
Merge branch 'master' of https://github.com/samsonos/htmlapp

Conflicts:
	app/view/index.php
	composer.json