add composer & phpunit
nf
remove composer
Merge branch 'phpunit'

Conflicts:
	composer.json
	composer.lock
merged
hf
nf
prototype for MVC
redefine rewrite rule
move index.php from app to html
Merge remote-tracking branch 'remotes/upstream/master'