Merge pull request #17 from JoshuaNotowitz/master

things
Merge pull request #18 from JoshuaNotowitz/master

payment info modal opening when thing happens that we want it to oppen w...
Merge pull request #19 from ikitha/master

started braintree setup
started braintree setup
Add balance column to user migration
Merge branch 'master' of github.com:kourosh/tally
fixed spa to pull in 3 templates at once, geolocating working yay
Merge branch 'master' of https://github.com/kourosh/tally

Conflicts:
	tally_SPA for local testing/index.html
Merge pull request #20 from ikitha/master

Fixed spa to pull in 3 templates at once, geolocating working yay
running locally