Merge branch 'master' of C:\Users\David\AndroidStudioProjects\ShadowChess with conflicts.
Merge remote-tracking branch 'origin/master'

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