init

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml