updated somthing
Merge branch 'master' of https://github.com/ontuebenjamin/ontue-b-sample

Conflicts:
	newfileingithub.php
Merge branch 'master' of https://github.com/ontuebenjamin/ontue-b-sample