final changes
Merge branch 'master' of https://github.com/kourosh/tally

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

Final changes