huh?
Merge branch 'master' of https://github.com/Gmd3/PlentyOfDoge

Conflicts:
	app/src/main/res/layout/fragment_welcome.xml