Additional fix to many-to-many association
Remove bcrypt password encryption
Remove bcrypt password encryption
Merge remote-tracking branch 'origin/issue/7/active_record' into rails-development
Merge remote-tracking branch 'origin/issue/8/database' into rails-development
Merge remote-tracking branch 'origin/rails-development' into issue/10/controllers