Fixed bug that arises when a user logs in with no balance
Merge branch 'master' of https://github.com/jizzyjugs/vendttp

Conflicts:
	server/server.py