changes blah
Merge branch 'master' of https://github.com/AppFace2014/Carbon_Tracker

Conflicts:
	JS/function.js