Initial commit
Done with the demo app
...
Merge branch 'master' of https://github.com/NBelyusenko/demo_app

Conflicts:
	Gemfile
	Gemfile.lock
	config/initializers/secret_token.rb
	config/routes.rb