trying to pull, need to commit
Merge branch 'development' of https://github.com/ahvigil/667project into development
fixed calendar bug