making up environment
Merge branch 'master' of github.com:skoba/rdolphin

Conflicts:
	Gemfile
	Gemfile.lock
	bin/bundle
	bin/rails
	bin/rake
	config/database.yml
Merge branch 'master' of github.com:skoba/rdolphin