transition state
Merge branch 'master' of github.com:WaleyChen/code-trial
Merge branch 'master' of github.com:WaleyChen/code-trial

Conflicts:
	app/views/interviews/index.haml
Merge branch 'master' of github.com:WaleyChen/code-trial