test commit
Merge branch 'master' of https://github.com/salometsiramua/Final-Project-Android

Conflicts:
	Final/bin/Final.apk
	Final/bin/classes.dex
	Final/bin/classes/com/example/freeuni/final_project/MainActivity$1.class
	Final/bin/classes/com/example/freeuni/final_project/MainActivity$2.class
	Final/bin/classes/com/example/freeuni/final_project/MainActivity.class
	Final/bin/classes/com/example/freeuni/final_project/model/State.class
	Final/bin/resources.ap_
	Final/src/com/example/freeuni/final_project/MainActivity.java