new commit

new shit
no big change
Merge branch 'master' of https://github.com/sfs1331/NewProject

Conflicts:
	index.php
fix