test
Merge branch 'master' of https://github.com/ssang1105/w3slide

Conflicts:
	.idea/workspace.xml
commit
com
test