Changed TEST

Testing commits
Merge branch 'master' of https://github.com/keephopealive/LVL

Conflicts:
	application/views/main.php