JS input changes
Merge branch 'master' of https://github.com/pavelboiko/mindship

Conflicts:
	js/mindship.js