Small code improvement
Merge remote-tracking branch 'origin/master'

Conflicts:
	styles/homepage.css