Last push before merge
fixed merge
Fix conflict in views/new.erb. Keep changes that Mike added to submit button.