added binding.pry in user controller
removed binding.pry from user controller
change the title
modified todo file
bcrypt working, created error message for minimum pw, pw reg ex in validation
fixed #note-all img element to autofit images added to notes
rebased
resolved merge conflicts
precompiled assets
precompiled, fixed marker js
fixed required_general permission for instructor modals
precompile for js changes
resolved merge conflicts