flag column added and applied to view
preparation for heroku deployment - gemfile changed
heroku problems solved
heroku issue with timepicker in css file solved
date_picker_input deleted to solve heroku error
deleted date and time pickers to solve heroku error
ruby version added to gemfile
merge conflicts solved