..
Merge https://github.com/wooGuk/SplugProject

Conflicts:
	mainView.html
tt