YOU SHALL NOT READ!!!!
Merge branch 'master' of https://github.com/Lapixx/WT3

Conflicts:
	application/controllers/welcome.php