FiFi Test Base.

Layouts and Random working, no changes can be made to the teams.
FiFi Test Base.

Layouts and Random working, no changes can be made to the teams.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/bermudi/fifi/Team.java
FiFi Test Base.

Layouts and Random working, no changes can be made to the teams.