different database names for each env
add user model
added .idea file to gitignore
Merge remote-tracking branch 'origin/master'
add docker instance management
Merge branch 'master' of github.com:davidgbe/LinuxBox
fix bad merge
Merge remote-tracking branch 'origin/master' into kh_info_page

Conflicts:
	Gemfile
	config/routes.rb
Merge branch 'kh_info_page' of github.com:davidgbe/LinuxBox into kh_info_page

Conflicts:
	config/routes.rb