Test
Merge remote-tracking branch 'origin/v1.0' into v1.0

Conflicts:
	index.php
Merge branch 'v1.0' of https://github.com/Yaki2000/Test into v1.0
Welcome Page