fsd
s
aaa
a
dsa

as
Merge branch 'master' of https://github.com/TuristAppV4/TuristAppV4 into jari

Conflicts:
	TuristAppV4/MainPage.xaml
Merge pull request #40 from TuristAppV4/jari

Jari