Snowpen
Snowpen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/libraries/play_services_4_3_23.xml
	.idea/libraries/support_v4_19_1_0.xml
Snowpen
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/appcompat_v7_19_1_0.xml
	.idea/libraries/play_services_4_3_23.xml
	.idea/libraries/support_v4_19_1_0.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/dva217/shadowchess/app/MainActivity.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Snowpen
Merge remote-tracking branch 'origin/master'