cleaned up some files
Merge remote-tracking branch 'origin/master'

Conflicts:
	ItsPartyTime/src/com/itspartytime/JoinPartyFragment.java
	ItsPartyTime/src/com/itspartytime/PartyActivity.java
	ItsPartyTime/src/com/itspartytime/SongView.java
Merge branch 'master' of https://github.com/trebegin/ItsPartyTime

Conflicts:
	ItsPartyTime/src/com/itspartytime/PartyActivity.java