m
Merge branch 'master' of https://github.com/maroha/superior.git

Conflicts:
	.classpath
	.gitignore
	.project
test