fix
Merge branch 'master' of gh:creatdenoi/homefile

Conflicts:
	app/src/homepage/home.html
	app/styles/main.css