shit
Merge branch 'master' of https://github.com/popovicititus/TeamOMFG

Conflicts:
	index.php
first real changes