fixed merge conflicts
form now uses placeholders instead of values
fix merge conflicts
Merge branch 'master' of https://github.com/nealcpeters/ScienceHackDay into building_out_ajax
Merge pull request #19 from nealcpeters/building_out_ajax

Building out ajax