testing...
Merge remote-tracking branch 'upstream/master' into tarBranch3
edited readme with git info
added to readme
Edited readme again
Edited readme again
edited readme
Merge pull request #2 from Tarwine/tarBranch3

Test Branch Number 3