test

test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/script.js
Merge branch 'master' of https://github.com/chulminz/sideLayer

Conflicts:
	src/script.js