first interface prototype works
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/wingman/ypc/MainActivity.java
first interface prototype works
first interface prototype works
Merge remote-tracking branch 'origin/master'

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