Merge branch 'master' of github.com:sektis/firstgit

Conflicts:
	index.php