trying to merge...
test
...
Merge branch 'master' of https://github.com/sp0ngey/TripApp

Conflicts:
	app/views/application/_authentication.erb