fixed organization folder
organization model changes
Merge remote-tracking branch 'origin/master' into laura
Merge branch 'master' of https://github.com/cemmanuel1/DBCFinalProject into laura