Updated game 2 and 3 interfaces
Merge remote-tracking branch 'origin/master'

Conflicts:

	PhoneApp/FingerNinja/FingerNinja/app/src/main/java/edu/sjsu/techknowgeek/fingerninja/TabActivity.java