Fixed User Controller
Merge pull request #5 from mcarmody/parag

Fixed User Controller
Added Devise
Merge pull request #6 from mcarmody/parag

Added Devise
Merge pull request #7 from mcarmody/carmody

Carmody
Merge branch 'carmody'

Conflicts:
	Gemfile.lock
	app/controllers/sessions_controller.rb
	config/routes.rb
fixed conflicts with merge
Merge pull request #9 from mcarmody/carmody

Started working with JS on signing page
Merge branch 'carmody'
fixed routes for merge
Merge branch 'master' of https://github.com/mcarmody/GalleryEighteen
Merge branch 'carmody'
Merge pull request #10 from mcarmody/carmody

Carmody
Merge branch 'master' of https://github.com/mcarmody/GalleryEighteen
Merge pull request #12 from mcarmody/master

Master