Upload of Data files
upload
Merge branch 'master' of https://github.com/AppFace2014/Carbon_Tracker

Conflicts:
	CSS/style.css
	JS/function.js
	JS/parse_functions.js
	index.html