tests
Merge branch 'master' of https://github.com/eliasron/migrationTest

Conflicts:
	instructions.txt