initial
Merge branch 'master' of github.com:artero/first_app

Conflicts:
	Gemfile
	Gemfile.lock