edited by eddie
kuan's change
Merge branch 'master' of github.com:ga-hk-ror-eddie-201305/hello-world-eddie
Merge commit 'bd39f5d844462c6e74fe936a25a6e47f811db0d4' into student_denis_edit

Conflicts:
	app/views/home/index.html.erb