testing
subdomain installed + views added + personal pc
Merge branch 'master' of https://github.com/numantayyab/fedena

Conflicts:
	Gemfile
	Gemfile.lock
	config/database.yml
	config/environment.rb
	config/routes.rb
	db/schema.rb
	log/development.log