Added support for custom Post#show
Merge pull request #28 from FlyoverWorks/custom-post-show

Added support for custom Post#show
Update README to include custom post type view instructions
Update README.md
Update version.rb
Added secondary media to post
Fixed secondary image reference to posts; added select secondary image button to Post#edit view
Added JS for selecting secondary image for posts
Add text snippets
Merge pull request #32 from FlyoverWorks/secondary-media

Secondary media
Add Storytime.snippet method and tests/doc
Merge branch 'dev' into snippets

Conflicts:
	app/assets/javascripts/storytime/editor.js.coffee
	spec/dummy/db/schema.rb
Merge branch 'snippets' into dev
Merge branch 'dev' into ui_updates

Conflicts:
	Gemfile.lock
	app/assets/javascripts/storytime/editor.js.coffee
	app/policies/storytime/post_policy.rb
	lib/storytime/version.rb
	spec/dummy/db/schema.rb