Added two form inputs
Merge branch 'master' of https://github.com/TheJoelF/1170-final-proj