gem file
Merge branch 'master' of https://github.com/KernelCorp/nedra

Conflicts:
	db/schema.rb
rename
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
deploy
dploy settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
deploy