lunch reports are working. could use a style refresh and some view refactoring
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
commit before merge
Merge branch 'master' of https://github.com/lunchpad/lunchpad.us into upstream_merge
merging
conflicts merged
Merge pull request #124 from deedeelavinder/master

altered devise views
added payments page and method to pay balance from wallet
conflicts merged
basic stripe functionality
Merge pull request #125 from kheang/master

basic stripe functionality
expanded nav bar
merging conflicts
Merge branch 'upstream_merge'
merging
precompiiiiiile
starting on credit card form
removed failing code so that tests will pass. will rewrite after i get this pushed
Merge pull request #126 from nickpassarella/master

expanded nav bar, first version of payments page
Merge https://github.com/lunchpad/lunchpad
merge
trying to fix travis