Added necessary gems before modding the branches.
Fixed some convention problems

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/searches_controller.rb
	app/models/comment.rb
	app/models/vote.rb
	app/views/layouts/_navbar.html.haml
	log/development.log
	log/test.log
	spec/factories/answers.rb
	spec/factories/questions.rb
	spec/factories/users.rb
	spec/factories/votes.rb
	spec/models/answer_spec.rb
Fixed the code to match company conventions. Created a bunch of helper functions for readablity ease

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/questions_controller.rb
	app/controllers/votes_controller.rb
	app/models/comment.rb
	app/views/layouts/_navbar.html.haml
	log/development.log
	log/test.log
	spec/models/question_spec.rb
	spec/models/user_spec.rb