merge
Merge branch 'master' of https://github.com/KOPOJI/codes

Conflicts:
	.idea/workspace.xml
ace static
ace static