prepping progress bar
Merge branch 'master' of https://github.com/nfpcooper/nfloyalty

Conflicts:
	templates/account.html
resolving conflicts