Initial 2
Merge https://github.com/gabriel-arce/Demo-App-Rails

Conflicts:
	Gemfile
	Gemfile.lock
	config/secrets.yml

Test