here is a commit message
Merge branch 'master' of github.com:shaneska/branchTest

Conflicts:
	README.md
Commit Message, new files