baadddd
Merge branch 'test_1'

Conflicts:
	insex.php
Merge pull request #1 from g0dlight/test_1

baadddd