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

calendar working yey
moving require_tree around
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru