more stuff;
Merge branch 'master' of ssh://github.com/ChineseHat/onlyinnola

Conflicts:
	html/index2.php
Merge branch 'master' of ssh://github.com/ChineseHat/onlyinnola