Initial commit
Merge branch 'master' of https://github.com/klidaras/first_ruby_app

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/klidaras/first_ruby_app

Conflicts:
	.gitignore