merge
simple calendar gem and events model
events controller and calendar view
user can add event, show event, convert date to strftime
fixed merge conflict
event functionality, sign in button, user profile
merge conflicts
fixed conflicts
fixed stuff
Merge pull request #12 from ashag/calendar

Calendar and events, some tests