fix merge problems
merge problem resolved
fixed form submission
craziness
put Gemfile.lock back under version control - Clinton said to