Converted project to Android Studio. Not working probably yet
Fixed bug when moving to Android Studio
Merge branch 'android_studio_version'

Conflicts:
	README.md