New changes
Merge branch 'feature_1' into dev

Conflicts:
	git101_stylesheet.css