Merged changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	styles/style.css