Put request not yet working
Merge conflicts just happened
Merge made my code break
Merge branch 'feature/app_modify_to_update' into develop
the views i made before conflicts
separate helpers methods from app.rb ... they are in helpers.rb now
put problem
Merge branch 'feature/amon_trying_again' into develop