Merge branch 'savings' of https://github.com/tinazheng/teluxe into stats

Conflicts:
	app/distance/distance.html
	app/index.html
	app/index/index.css
	app/instructions/instructions.js
	app/services/qStorage.js
	app/stats/stats.js

-cleaned up merge
-redid css for types