Added a great feature to let the solution die
Changed the UUID of the die festure, as requested
Merge branch 'master' into die-feature

Conflicts:
	testGIT/forms/form1.js
Merge pull request #1 from scm-course-20140403/die-feature

Added a great feature to let the solution die