fixed time conflict alert, added feedback submit form and associated ruby controller

still need to hook up the controller to the db
ignore yml