Auto-commit 2013-03-31 13:56:39
Merge branch 'master' of https://github.com/dmillerw/SecretProject