Working on the ui for the game
UI
Merge https://github.com/jjw1707/SimCards

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/simcards/Card.java
	app/src/main/java/com/example/simcards/GameView.java
	app/src/main/java/com/example/simcards/MainActivity.java
Merge https://github.com/jjw1707/SimCards