log files
Merge https://github.com/trosborn/NewYears

Conflicts:
	log/development.log
	log/test.log
added calendar
beautified calendar
Merge pull request #16 from aliciafrench/master

Added calendar