Mongol
,gitignore hits the fan
Merge branch 'master' of https://github.com/CupCoffee/chmod777

Conflicts:
	application/controllers/IndexController.php