Merge branch 'master' of https://github.com/jekkos/pocketmoney

Conflicts:
	index.htm