Added some stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/wintrisstech/erik/iaroc/Lada.java