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
edit gitignore
new Gemfile changed a little
pushed gitignore file once again to test
add models for our postgres db
add migrations for postgres db
add .DS_Store files in folders to remove unracked files
Merge pull request #1 from vakhalin/dev

merge done