updates
Merge branch 'master' of https://github.com/gregjc01/receipt_tracker

Conflicts:
	.gitignore