start
Merge branch 'master' of github.com:fikys/my_rubydev

Conflicts:
	.gitignore