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
adds models, migrations, and seeds for money
working on index display
should fix the problem
Merge pull request #45 from arieldiamond/fix_trip_view

should fix the problem
dyanmic forms are showing but not posting properly
adds class methods and read cuntionality for one expense
Merge branch 'master' into money
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