undid some commits
Merge branch 'master' of github.com:celestialmonkey/testrepo