merge
simple calendar gem and events model
events controller and calendar view
user can add event, show event, convert date to strftime
Merge pull request #10 from ashag/posts

Posts
fixed merge conflict
event functionality, sign in button, user profile
Merge pull request #11 from ashag/posts

users can comment on posts using disqus
merge conflicts
fixed conflicts
fixed stuff
Merge pull request #12 from ashag/calendar

Calendar and events, some tests
tools renders partial view
Merge branch 'master' into posts
calendar renders partial views