Change copy
Merge branch 'master' of https://github.com/muvera/cakehollywood

Conflicts:
	app/config/database.php
This is the message
This is a sample