Elissa' s changes for cognitive propmts as of Nov. 18th, 4:58
Merge branch 'master' of https://github.com/hcilabasu/teachable-mobile

Conflicts:
	controllers/robot.py
	static/js/attributions.js