init
Merge branch 'master' of http://github.com/last911/tfop

Conflicts:
	composer.json