Working on input more.
Merge branch 'master' of https://github.com/team3499/2014

Merged.