update input stuff
Merge branch 'master' of github.com:chrisbeard/hackcentral