Merge pull request #14 from tanvirt/andrew
Created tex file for teaching/advising courses
Created rendre file for teaching/advising courses
Removed >>>>>>>HEAD. Please don't upload code to master that breaks the program. Master should be syntax/bug fre 24/7
Fixed 'Report' instances in tenure controller
Fixed error 'String must use single quotes'
Commented out initializing arrays because syntax is not correct for mongoose. The project now runs grunt test and grunt without errors and all tests pass!
Commented out initializing arrays because syntax is not correct for mongoose. The project now runs grunt test and grunt without errors and all tests pass!
Merge branch 'Fixing_Bugs' of https://github.com/tanvirt/Faculty-Activity-Report into Fixing_Bugs
Never mind, required is a valid field and does not conflict with mongoose's required keyword
Merge pull request #17 from tanvirt/Fixing_Bugs

Fixing bugs
Create dateAppointed.server.model.js
Create dateAppointed.server.model.test.js
Merge pull request #18 from tanvirt/dateAppointed

Date appointed schema and tests added
Merge branch 'master' into controller