Revert "Revert "Revert "test"""

This reverts commit 925445c550b746313c4dc3aa0551134405eafa9d.
Revert "Revert "test""

This reverts commit 89e62239cfa8fa433504e0a51d613c1dfe0f3ffe.
fixed name prompt box bug
Merge branch 'master' of https://github.com/LemonMyth/TeamProject

Conflicts:
	.idea/workspace.xml
	index.html