Begin user input
Merge branch 'master' of https://github.com/mtw17/A6