Init commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	composer.json
	web/index.php
#3