added
Merge branch 'master' of https://github.com/jeremiahajohnson/GitHubTraining

Conflicts:
	Project/Folder Structure/1/Macro.txt
added
Merge pull request #1 from jeremiahajohnson/NewBranch

New branch