Merge branch 'master' of https://github.com/krajj7/pikater

Conflicts:
	.classpath
Classpath merge.
Merge branch 'master' of https://github.com/krajj7/pikater

Conflicts:
	.classpath