Some protect changes.
.gitignore is now working
Update .gitignore
Update .gitignore
.gitignore
Update .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/config.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore