Merge pull request #172 from elplatt/dev

adds account balances for paypal
Merge remote-tracking branch 'origin/dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Removed logo.png from ignore list because it's not working

I've really gotta figure out how to ignore that damn file...
Merge branch 'master' into dev