git@ -> https
boot & debug
submodule
Merge branch 'psr0' of https://github.com/Floxim/floxim-demosite into psr0

Conflicts:
	index.php
	vendor/floxim/floxim