stuf

words uuids fixing things
Merge branch 'master' of https://github.com/CSLLC-Codeathon-2014/Door-Karma-Client

Conflicts:
	www/js/index.js