Added test2
Added test2
Merge branch 'master' into test-1

Conflicts:
	test2.sql
Merge pull request #4 from ferdiependon/test-1

Test 1