Some changes;
Merge branch 'master' of github.com:BobroCoderArchive/test

Conflicts:
	main.php