Added feature1
fixed test
Added cool stuff
Merge branch 'feature_1'

Conflicts:
	test