Updated page
Merge branch 'master' of https://github.com/idiginfo/eswc-hackathon

Conflicts:
	index.php