Fixing variable structure issue #42
Merge branch 'gh-pages' of https://github.com/zlsa/atc into gh-pages

Conflicts:
	assets/scripts/input.js