test
Merge branch 'master' of https://github.com/mkcls/ideasRepo

Conflicts:
	.project
	public/404.html