Merge branch 'master' of https://github.com/fcbaila/Hyperzine

Conflicts:
	index.php
add header v1.2
add header v1.3