erics commit
Merge pull request #1 from oheric/ericsbranch

erics commit
Merge branch 'master' of https://github.com/oheric/teamgit into BriansBranch