Merge branch 'master' of https://github.com/jdori/Wingman

Conflicts:
	app/src/main/java/com/wingman/ypc/MainActivity.java