resolve conflict
Merge branch 'master' of github.com:WaleyChen/code-trial

Conflicts:
	app/assets/stylesheets/interview.css.scss
	app/controllers/interview_controller.rb
	app/views/code_trial/show.html.haml
	config/routes.rb