Fixat bin och gen
Merge branch 'master' of
https://github.com/genomizer/genomizer-android.git

Conflicts:
	Genomizer-Android/src/se/umu/cs/pvt151/MainActivity.java