couple small fixes, started cleaning up show pages a bit
merge issues
merge issues
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
merge issues
commit
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
style changes
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app

want to commit
Merge pull request #80 from thebkbuffalo/invite_controller

adds invitations views and removes erb from invite_friends
small nothings
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
changes to user show
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app

pushing my user showpage changes
changes to styles on user show page
logic fixed
merge fixes
new style changes
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app

all works