fan hits deltion
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/IndexController.php
fan hits deltion
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zfproject.xml
	application/Bootstrap.php
	application/controllers/IndexController.php
	application/views/scripts/index/index.phtml
Merge branch 'master' of https://github.com/CupCoffee/chmod777

Conflicts:
	.zfproject.xml
	application/Bootstrap.php
	application/controllers/IndexController.php
	application/views/scripts/index/index.phtml