vb1
Merge branch 'master' of https://github.com/erigaziodmx/testing

Conflicts:
	code.txt