gemfile
moved activities to trip page and fixed links
I hate temp files
Merge pull request #58 from arieldiamond/javascript

Javascript