lewenty 17:54
lewenty 17:55
Merge branch 'master' of https://github.com/lewenty/test.git

Conflicts:
	index.php
lewenty 18:03