fixed models
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development
fixed merge conflicts
fixed merge conflict on app/model/board