Added feature 2

Yet again, self-explanatory
Merge branch 'feature2'

Conflicts:
	features.txt