Jared's Second Commit
Merge branch 'master' of https://github.com/TBST/test

Conflicts:
	README 2.txt