added total calories after table
Merge branch 'master' of https://github.com/louissobel/treattrackr

Conflicts:
	app/templates/add_item.html