Reinitialize
Merge https://github.com/VeeSot/first_app

Conflicts:
	.idea/workspace.xml
	first_app/Gemfile