Merge branch 'Master' of https://github.com/Webb-2/Project-X

Signed-off-by: Adam Hjerpe <adamhjerpe@Herpy.local>

Conflicts:
	loop.php
Merge branch 'Master' of https://github.com/Webb-2/Project-X