Added initial work to onCreate()
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/com/example/app/PartyQueue.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_party_queue.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_party_queue.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_party_queue.xml