Conflicts:
	db/schema.rb

Ready User Controller

Sam seed

	new file:   app/controllers/questions_controller.rb
	new file:   app/views/questions/new.html.erb
	modified:   config/routes.rb

	modified:   app/controllers/questions_controller.rb
	modified:   app/views/questions/new.html.erb

Question new

added index method to user controller

	new file:   app/views/questions/show.html.erb

	modified:   app/controllers/questions_controller.rb

…the user of each

	modified:   app/views/questions/show.html.erb

Sam login

	modified:   config/routes.rb

Fix user issues

Conflicts:
	app/controllers/user_controller.rb

	new file:   app/controllers/questions_controller.rb
	modified:   app/controllers/users_controller.rb
	new file:   app/views/questions/new.html.erb
	new file:   app/views/user/index.html.erb
	new file:   app/views/user/login.html.erb
	modified:   config/routes.rb

	modified:   app/controllers/questions_controller.rb
	modified:   app/views/questions/show.html.erb

…tion_show

Ka/new user

	new file:   app/controllers/answers_controller.rb

	modified:   app/views/questions/show.html.erb
	deleted:    app/views/user/index.html.erb
	deleted:    app/views/user/login.html.erb

	modified:   config/routes.rb

	new file:   app/views/users/index.html.erb
	new file:   app/views/users/login.html.erb

…tion_show

	modified:   app/controllers/answers_controller.rb

…essions controller for logoutu

Question show

Conflicts:
	app/controllers/answers_controller.rb
	app/controllers/questions_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb

	new file:   .DS_Store
	modified:   Gemfile
	modified:   Gemfile.lock
	new file:   app/.DS_Store
	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/answers_controller.rb
	modified:   app/controllers/questions_controller.rb
	new file:   app/controllers/users_controller.rb
	modified:   app/models/answer.rb
	modified:   app/models/question.rb
	modified:   app/models/user.rb
	new file:   app/views/.DS_Store
	modified:   app/views/layouts/application.html.erb
	new file:   app/views/questions/new.html.erb
	new file:   app/views/questions/show.html.erb
	new file:   app/views/users/.DS_Store
	new file:   app/views/users/index.html.erb
	new file:   app/views/users/login.html.erb
	new file:   app/views/users/new.html.erb
	new file:   app/views/users/show.html.erb
	modified:   config/routes.rb
	modified:   db/migrate/20150410161434_create_questions.rb
	modified:   db/migrate/20150410161442_create_answers.rb
	modified:   db/schema.rb
	modified:   db/seeds.rb

	modified:   app/controllers/questions_controller.rb
	modified:   app/views/questions/index.html.erb

Sam delete create question

Conflicts:
	app/controllers/questions_controller.rb

	modified:   app/controllers/questions_controller.rb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/questions/show.html.erb

	modified:   app/controllers/answers_controller.rb

Conflicts:
	app/views/answers/edit.html.erb

	modified:   app/assets/stylesheets/application.css
	modified:   app/controllers/answers_controller.rb
	modified:   app/controllers/questions_controller.rb
	deleted:    app/controllers/sessions_controller.rb
	modified:   app/controllers/users_controller.rb
	modified:   app/helpers/application_helper.rb
	modified:   app/views/answers/edit.html.erb
	modified:   app/views/layouts/application.html.erb
	modified:   app/views/questions/index.html.erb
	modified:   app/views/users/index.html.erb
	modified:   app/views/users/login.html.erb
	modified:   app/views/users/new.html.erb
	modified:   app/views/users/show.html.erb
	modified:   config/routes.rb

Update answer#create/update

Fix Login/logout on layout

Sam user edit delete

…nto Malcolm_front_pt_1

Malcolm front pt 1

	modified:   app/models/answer.rb
	new file:   app/models/comment.rb
	modified:   app/models/question.rb
	new file:   app/models/vote.rb
	new file:   db/migrate/20150411205231_create_comments.rb
	new file:   db/migrate/20150411205924_create_votes.rb
	modified:   db/schema.rb

Made polymorphic comments and votes table

Add links for user and question

…swers and questions

Question show frontend

user cant answer unless logged in

Sign login ajax

not ajax but looks cool!