test branch commit
test folder merge
deleted folder
deleted files
Revert "deleted folder"

This reverts commit 5b06d77e90a35a252a5e8bb66f336cc9e7d3775b.
Merge remote-tracking branch 'origin/master' into test-branch
conflicting merge test
conflicting merge test
test commit
Merge remote-tracking branch 'origin/master' into test-branch

Conflicts:
	README.md
Merge remote-tracking branch 'TeamCopy/master'