Merge branch 'master' of https://github.com/herlixjae/tubes1

Conflicts:
	README.md
	index.php
Merge branch 'master' of https://github.com/herlixjae/tubes1

Conflicts:
	README.md
	index.php