Code does not work
Merge branch 'master' of https://github.com/russellbaxt/iAndroid2014.git

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