merge issue fix
fixing merge issues
merge issues
merge issues fix
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
merge issues
merge issues
merge issues
merge issues
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
merge issue fixings
fixed calendar. application.css needs what looks like is commented out stuff
Merge pull request #58 from thebkbuffalo/javascript_fix

Javascript fix