rails new rails-starter -d postgresql -T (4.0.6)
Merge branch 'rails-new'

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' into bootstrap