merge conflit
Finished cakephp blog tutorial
merge conflict.
Merge branch 'cake-blog'