Trips are gay
Merge remote-tracking branch 'origin/master'

Conflicts:
	RuberPlay/app/is/ru/honn/ruber/users/data/UserData.java
Trips are gay