auto change
Merge remote-tracking branch 'origin/master'

Conflicts:
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$attr.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$dimen.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$drawable.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$id.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$layout.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$menu.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$string.class
	TechUMeApp/bin/classes/com/MetalJourny/techumeapp/R$style.class
	TechUMeApp/gen/com/MetalJourny/techumeapp/R.java
spinners now work
started on the conversion lists