Testing
stash
added Twitter Bootstrap gem
Merge branch 'branch-bootstrap'
Merge pull request #1 from davemess/master

Grabbing lastest commits
I add devise to the project
I updated the registration views
Merge branch 'master' of https://github.com/Tahan90/Guithub

Conflicts:
	Guithub/Gemfile.lock
	Guithub/app/assets/javascripts/application.js
I readding my code
added Difficulties model and seed data
add Chapter and Lesson models
added associations

Lesson - Difficulty
Lesson - Chapter
I added a basic landing page and fix the logging out issue
Merge branch 'StoryViewLesson' of https://github.com/davemess/Guithub

Conflicts:
	Guithub/Gemfile
	Guithub/Gemfile.lock
	Guithub/config/routes.rb
	Guithub/db/schema.rb