commit arka
Merge branch 'master' of https://github.com/arka-g/penguincarpool

Conflicts:
	.idea/workspace.xml

out/production/main/com/mcmaster/t202/penguincarpool/JoinScreen$JoinGetI
O$1.class

out/production/main/com/mcmaster/t202/penguincarpool/JoinScreen$JoinGetI
O.class
	out/production/main/com/mcmaster/t202/penguincarpool/JoinScreen.class

out/production/main/com/mcmaster/t202/penguincarpool/LoginScreen$LoginGe
tIO.class
	out/production/main/com/mcmaster/t202/penguincarpool/LoginScreen.class
	out/production/main/com/mcmaster/t202/penguincarpool/MapScreen.class

out/production/main/com/mcmaster/t202/penguincarpool/ProfileScreen.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$drawable.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$id.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$layout.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$menu.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$string.class
	out/production/main/com/mcmaster/t202/penguincarpool/R$style.class
	out/production/main/com/mcmaster/t202/penguincarpool/R.class

out/production/main/com/mcmaster/t202/penguincarpool/RegisterScreen$Regi
sterIO.class

out/production/main/com/mcmaster/t202/penguincarpool/RegisterScreen.clas
s

out/production/main/com/mcmaster/t202/penguincarpool/RequestScreen$JoinI
O.class

out/production/main/com/mcmaster/t202/penguincarpool/RequestScreen$Order
IO.class

out/production/main/com/mcmaster/t202/penguincarpool/RequestScreen.class
	out/production/main/main.apk