committing so i can check out master
Merge branch 'master' into testing
user specs
Merge branch 'master' into testing
Merge pull request #12 from nealcpeters/models

Models
solved merge conflict in gemfile.lock
solved merge conflict
Merge branch 'master' into testing
Merge pull request #13 from nealcpeters/testing

Testing
config for database cleaner
fixed typo in the spec helper comment
add jquery 2.0.0 and ui
Merge pull request #14 from nealcpeters/prawn_integration

add jquery 2.0.0 and ui
Merge branch 'master' of https://github.com/nealcpeters/infobytes into models
added chapters model and created controllers for users, tutorials, chapters, subchapters-empty on this one