changes
Merge branch 'master' of https://github.com/Snaquaza/Test

Conflicts:
	config/commands.js
	data/formats.js