feature 2 ftw
Merge branch 'test' of https://github.com/t3hMarK/SampleRepository into feature_2

Conflicts:
	readme.txt