Cummulative flow working
Merge branch 'master' of https://github.com/ConnerReeves/RallyON-2014-Hackathon

Conflicts:
	App.js
	deploy/App-uncompressed.html
	deploy/App.html