First Commit
Merge branch 'master' of github.com:jimmymadon/test_cake

Conflicts:
	.gitignore