fix conflicts from arash's index
Merge branch 'integration' of github.com:CodeCoreYVR/event_management into integration
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
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
fixed gem formtastic issue
Merge pull request #28 from CodeCoreYVR/dons_branch

Dons branch