Initial commit
Merge branch 'master' of https://github.com/Nakah/demo_app

Conflicts:
	.gitignore
	Gemfile
	config/application.rb
	config/boot.rb
	config/initializers/secret_token.rb
	config/routes.rb
	public/robots.txt

Signed-off-by: Nakah Nakah <metal123@gmail.com>