fixing input form - all done except for user ID and second partial form
Merge pull request #7 from Chenyijun/master

abilities
fixed input.rb for merge conflict
Merge pull request #9 from Chenyijun/master

Changed ability
got rid of food_id as a required item in validations of input.rb
Merge branch 'master' of https://github.com/Chenyijun/hackcmu2014
about page, input form, input.rb
merge
Pulled from Sangha
Working on inputs