Merge branch 'master' of https://github.com/Flllexa/Entheusiasmos

Conflicts:
	www/index.html
update home2