Better
Merge branch 'master' of https://github.com/Winndal/UNICS

Conflicts:
	frontpage.php
Merge branch 'master' of https://github.com/Winndal/UNICS

Conflicts:
	frontpage.php