Merging => resolu (val)

Conflicts:
	index.php => resolu
Merge branch 'master' of https://github.com/Wafflewrath/lo18_utsh