Merge branch 'master' of https://github.com/tinazheng/teluxe

Conflicts:
	app/app.js
	app/index/index.html

started savings calculations
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
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
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
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

-added types
-fixed data errors
-updated process light
-intergated ebay into stats
-added cost calculation to stats
-implemented (most likely finished) stats page
-added retest button
-fixed minor ng issues
-removed testing files