added calendar
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	log/development.log
merge finished
merged calendar with master and pushing up to github
Merge pull request #1 from Jessica-L/noah-branch

Noah branch with calendar merged into master