input down
Merge branches 'master', 'master' and 'master' of github.com:pltan33/xboom

Conflicts:
	js/dist/xboom.min.js