Initial commit
initial android commit, with super cool gradugation logo!
Merge branch 'master' of github.com:tash1207/Gradugation

Conflicts:
	.gitignore
created the main activity page, got rid of the title bar
added a how many players screen as well as a choose character screen.
added a settings page to turn off music, which involved adding a new button to the home page, so I rearranged the layout to fit 4 buttons. I changed the text color on the buttons to black so it was more readable, and centered the word Gradugation. I added music that plays on the main page, however when pages are switched the onPause activity is caused, which causes the music to stop. Need to find a way around this.
ignored .metadata/ files, and removed .metadata/ files
fixed android manifest activity names
created a basic version of the bench press minigame which currently gets launched after pressing continue on the choose character screen
I added the word YAY to readme
fixed bug when you click on continue in choose character screen, app no longer crashes
added onResume and onPause method to each activity to handle music playing
made the minigame portrait mode only so orientation change does not affect game, set up 10 second countdown timer, displaying instructions before game begins
made a button selector that looks like the mockups
Merge branch 'master' into bench_press_game

Conflicts:
	src/com/gradugation/ChooseCharacterActivity.java
Merge branch 'master' of github.com:tash1207/Gradugation

Conflicts:
	src/com/gradugation/ChooseCharacterActivity.java
added wires minigame
Merge branch 'master' of https://github.com/tash1207/Gradugation into wiresGame

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
made wires game activity landscape only, made main activity portrait only, fixed dialog message when winning wires game 4
added win/lose function to make code less repetitive.