starting to create info page
Merge branch 'master' of https://github.com/hkloom/phaseball

Conflicts:
	info_page