Shoo, trailing whitespace, shoo
Merge branch 'master' of github.com:ZeusWPI/hydra