loiyoi
Merge branch 'master' of https://github.com/koybun/IHL

Conflicts:
	controllers/application.php
	index.php