Fixed some shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/commands.js