Added the input for the UI
Merge branch 'master' into gh-pages

Conflicts:
	angryGandalf.html