feature first commit
more commit goodness
Merge branch 'test' of https://github.com/t3hMarK/SampleRepository into feature_1

Conflicts:
	readme.txt