database setup
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/threeSentences
update gitignore
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/threeSentences
pandoc
resolve merge conflict
edit gemfile
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/threeSentences
update export controller/model to receive data from ajax form
traced bug in export to db seed file
fix bug in seed file
removed pandoc gem and tests
clean up story model
comment out file create line in story.export method
Merge pull request #26 from woolly-bear-caterpillars-2014/export

Export, fixes dbase seed bug, creates rtf file from ajax form info