Fix attempt
S
Merge branch 'master' of https://github.com/Jeppes/ParkeraSthlm

Conflicts:
	MyApplication2/.idea/.name
	MyApplication2/.idea/misc.xml