AMAZING JOB ZYPHIREX
Merge branch 'master' of https://github.com/Snaquaza/Test

Conflicts:
	data/formats.js