Merge branch 'master'

Conflicts:
	css/stylesheet.css
What is going on?!