cakePHP configuration
Merge branch 'master' of https://github.com/abrandao/portfolio

Conflicts:
	README.md