Merge branch 'tinymce' of github.com:purple-martins-2013/storyward
Merge branch 'master' of github.com:purple-martins-2013/storyward
formatting story creation entry fields
modify display of story content in shortened form, by stripping html tags in js -- sanitize to be added
integrate guard with unicorn, create procfile
integrate guard with unicorn, create procfile
Merge branch 'herokuize'
integrate guard with unicorn, create procfile
Merge branch 'herokuize'

Conflicts:
	Gemfile
integrate guard with unicorn, create procfile
Merge branch 'herokuize'
add sanitize helper for story creation
use asset pipeline helpers for urls in css
Merge branch 'herokuize'
fix foundation mobile topbar collapse issue
Merge branch 'formatting' of github.com:purple-martins-2013/storyward
sort stories by total node number
correct story link path
add partial for displaying links on story reading page, and revise logic slightly
Merge pull request #31 from purple-martins-2013/herokuize

Herokuize