updated gitignore for vim
add session controller
Merge branch 'master' of https://github.com/ElizabethU/Scheduler
modify session controller
calendar has links... everyday for some reason
Merge pull request #4 from ElizabethU/meetings

calendar has links... everyday for some reason
merge conflict