Added inputs and things
Added inputs to the file
Merge branch 'master' of https://github.com/rcockbur/project