Merge branch 'test' of https://github.com/myndhax/test into test

Conflicts:
	README
Merge branch 'test'

Conflicts:
	README