This is a test commit
Merge branch 'master' of github.com:jniziol/NewProject

Conflicts:
	Test.txt
Bug Fix #1
Merge remote-tracking branch 'origin/master' into feature_1