ALmost good to go
Merge remote-tracking branch 'origin/master'

Conflicts:
	daniel/app/src/main/res/layout/activity_mafia.xml
Merge remote-tracking branch 'origin/master'
final fix (hopefully)
final push