asdlkjas
Merge branch 'master' of https://github.com/nihilim/WhiskeyPapa

Conflicts:
	WhiskeyPapa/WhiskeyPapa/MainPage.xaml
	WhiskeyPapa/WhiskeyPapa/WhiskeyPapa.csproj