Merge pull request #4 from tjohnson1965/master

calendar feature finish
Merge pull request #2 from Hdtran89/master

Merge pull request #4 from tjohnson1965/master