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
merge master
maps and calendars all working
maps and calendars working with occasional crashes
Merge pull request #48 from arieldiamond/javascript

Javascript
spec routes
spec routes
Merge pull request #49 from arieldiamond/javascript

Javascript
nested forms work, need to finish editing
resolving merge conflicts
Merge pull request #50 from arieldiamond/voting_gem

Voting gem
polls specs fixex
Merge pull request #51 from arieldiamond/fix_polls_spec

polls specs fixex
merging