added models, views, and routes
voting works, need to create a new poll still
still working on nested form, try to use gem called cocoon
resolving merge conflicts
form is still broken
dyanmic forms are showing but not posting properly
trips calendar
Merge pull request #46 from arieldiamond/map_calendar

trips calendar
activities calendar success
javascript improvements
more javascript
Merge pull request #47 from arieldiamond/activities_calendar

Activities calendar
merge master
install bootstrap, start nav & main container
nav partial
...
comment out yield section
create welcome layout
maps and calendars all working
working on welcome page