2nd pull
Merge pull request #2 from arkes/second_pull

2nd pull
third pull
Merge pull request #3 from arkes/third_pull

third pull
Merge remote-tracking branch 'origin/master' into first_pull

Conflicts:
	test.sql