addedd cocoon, needs testing
updated cocoon divs
Merge pull request #11 from craigmcginley/cocoon

Cocoon
Merge branch 'master' into before_filters
merging in changes from cocoon branch
added authorization for post edit/delete actions, with tests
added necessary stuffs, removed some extra code not being used