edited the forms
Changed Gemfile... Again.
Merge branch 'cwcarlson10-master'