initial new commit
Merge branch 'dev' of https://github.com/vakhalin/tripwithme into dev

Conflicts:
	.gitignore
	Gemfile
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb