added calendar gem; edited validations
fixed merge conflicts with master
Merge pull request #17 from mkmizuta/calendar

added calendar gem; edited validations