fixing
Merge branch 'master' of https://github.com/Tykrael/annick

Conflicts:
	css/main.css
	index2.php