adding cid to students table
removing fb_users table
CalNet and Refactoring
Removing FB login controller
merge conflict
Alfonso's fix
Merged with master
Merged and bugfixed
Had left some uncommitted files
Merge pull request #8 from TheArchitects/2nd_calnet

2nd calnet