everything is working now1111111
Merge branch 'master' of https://github.com/kourosh/tally

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

everything is working now!!!!!