fixed the div on paragraph creation to expand, but regex not catching html tags
Merge pull request #104 from nealcpeters/style

Style
fixed the ordering in chapters
Merge branch 'master' of https://github.com/nealcpeters/infobytes into index_ajax
added migration to add number column to sub_chapters table and fixed the ordering issue
Merge pull request #105 from nealcpeters/index_ajax

Index ajax
changed button hover for matt
Merge branch 'master' of https://github.com/nealcpeters/infobytes
removed the regex to properly format paragraphs....editable div does it on its own. Also updated the paragraph update to have the div
updated tests to reflect new features on some pages. Also commented out pending tests cause they annoy me
Merge branch 'master' of https://github.com/nealcpeters/infobytes into eric_a_tag_fixed
fixed button to make matt happy
Merge pull request #106 from nealcpeters/eric_a_tag_fixed

Eric a tag fixed
added classes to edit links on subchapter show
Merge branch 'master' of https://github.com/nealcpeters/infobytes into index_ajax
Merge branch 'master' of https://github.com/nealcpeters/infobytes
merge conflicts with master
removed conflicting css
refactored tests by adding spec helper methods
Merge branch 'master' of https://github.com/nealcpeters/infobytes into eric_a_tag_fixed