begin sound
Merge branch 'master' of https://github.com/ProjPossibility/2014-USC-MMGame-3
Merge branch 'master' of https://github.com/ProjPossibility/2014-USC-MMGame-3

Conflicts:
	BlindSwordmaster/blindswordmaster/src/main/java/com/wontonst/blindswordmaster/DuelActivity.java
Merge remote-tracking branch 'origin/master'