Update stuffs
Merge branch 'master' of https://github.com/Kevvrivs/RedPandanic

Conflicts:
	.classpath