1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/home/detail.html.erb
Merge branch 'master' of https://github.com/ivancxj/shi
1