teast

test
test

test
Merge branch 'master' of https://github.com/efarina/test

Conflicts:
	test.php

git commit