resolved conflicts with integration css and index
Merge pull request #22 from CodeCoreYVR/event_c

Add seats to events
Merge pull request #23 from CodeCoreYVR/event_c

Add migration file missing from my last commit
fix conflicts from arash's index
Merge branch 'integration' of github.com:CodeCoreYVR/event_management into integration
Merge pull request #24 from CodeCoreYVR/event_c

Misc fixes as per Tam's comments.
Merge branch 'integration' of github.com:CodeCoreYVR/event_management into integration
added link to formatastic gem gem 'formtastic-bootstrap', git: https://github.com/mjbellantoni/formtastic-bootstrap.git
Added form-control to edit page
Revised Admin Events Show, Modify and Delete Page to make it more user friendly
Merge pull request #25 from CodeCoreYVR/event_c

Add admin pages for attendee control.
fixed conflicts from arash's latest commit 11:53pm Feb 8
having issues with index page, cannot render, error on line 87. when I comment out f.input :mail_list, as:boolean the page works... when I leave it in the code breaks please help
Merge pull request #26 from CodeCoreYVR/event_c

Iterate threw categories properly.
fixed gem formtastic issue
Merge pull request #28 from CodeCoreYVR/dons_branch

Dons branch
Style changes for events, and clean up of index.html
more style changes
added styles for events and fixed some flow issues with index
More style changes to menus