Added music and some controls
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameActivity/src/edu/harding/AndroidPentago/AudioPlayer.java
	GameActivity/src/edu/harding/AndroidPentago/GameFragment.java
	GameActivity/src/edu/harding/AndroidPentago/SettingsActivity.java