bla
Merge branch 'spots-near-you' of https://github.com/Jeppes/ParkeraSthlm into spots-near-you

Conflicts:
	MyApplication2/.idea/workspace.xml