calendar working yey
merge conflict
Merge pull request #133 from dheckman/master

calendar working yey