working on seed file
Merge branch 'master' into links
added tests for chapter creation
Merge pull request #55 from nealcpeters/tutorial_page

Tutorial page
added some stuff
Merge branch 'master' of https://github.com/nealcpeters/infobytes into models
working on merge conflict
added styling for images
subchapters slide in and out works in tutorial show
changed seed file, probably some other things i cannot remember
merge conflicts in gemfile lock
Merge pull request #56 from nealcpeters/models

Models
Merge branch 'master' into links
Merge pull request #57 from nealcpeters/links

Links
stuff we worked on
Merge branch 'master' of https://github.com/nealcpeters/infobytes into codesnippet
added test that create new sub_chapter button works
added tests to check to sub chapter creation feature, but weird error when checking a bad entry
added tests to check for and follow icon/text links on sub chapter page to img, code, txt
Merge pull request #58 from nealcpeters/codesnippet

Codesnippet