aaa
Merge branch 'master' of https://github.com/JsAaron/avalon

Conflicts:
	.idea/workspace.xml
	src/index.html