Merge branch 'master' of https://github.com/junhyeonjeon/MyHome.git

Conflicts:
	MyHome/WebContent/html/index.html

Merge branch 'master' of
https://github.com/junhyeonjeon/MyHome.git

Merge branch 'master' of
https://github.com/junhyeonjeon/MyHome.git
Revert "Merge branch 'master' of https://github.com/junhyeonjeon/MyHome.git"

This reverts commit 4e18544bc4f2a2e04d82317403e2221d036aa04a.
Merge remote-tracking branch 'origin/master'