lame attempts at rails calendar
fixing merge issues/lame attempt at rails calendar
Merge pull request #37 from thebkbuffalo/adding_calendar

lame attempts at rails calendar