trips areeee soooooo gaaaaayyyyy
Merge remote-tracking branch 'origin/master'

Conflicts:
	RuberPlay/app/controllers/HistoryController.java
	RuberPlay/app/controllers/TripController.java
trips areeee soooooo gaaaaayyyyy
Merge remote-tracking branch 'origin/master'
trips areeee soooooo gaaaaayyyyy
Merge remote-tracking branch 'origin/master'