bajs
hatargit
Merge branch 'master' of https://github.com/Jeppes/ParkeraSthlm

Conflicts:
	MyApplication2/.idea/.name
	MyApplication2/.idea/misc.xml
	MyApplication2/app/app.iml
	MyApplication2/app/build.gradle
	MyApplication2/app/src/main/AndroidManifest.xml

	MyApplication2/app/src/main/java/com/example/parkerasthlm/app/MainActivity.java
	MyApplication2/app/src/main/res/layout/activity_main.xml
	MyApplication2/app/src/main/res/values/strings.xml
	MyApplication2/gradlew.bat