Inputv1.1
Merge branch 'input' of https://github.com/duke-compsci308-spring2013/vooga into input