inputs
Merge branch 'master' of https://github.com/alexvw/canvas-experiment-1

Conflicts:
	index.php