Merge branch 'master' of https://github.com/x09105875/ARIA-Project

Conflicts:
	stats.html
Merge branch 'master' of https://github.com/x09105875/ARIA-Project

Conflicts:
	stats.html