fixed some errors in the cabin parser
commit
Merge branch 'master' of
https://github.com/Quasineation/cabinwebproject.git

Conflicts:
	.classpath