OCD
Renamed stuff
Merge branch 'master' of https://github.com/RBMNT/RBstation2

Conflicts:
	RBstation2.dme
Merge branch 'master' of https://github.com/RBMNT/RBstation2