beggining
Merge branch 'master' of https://github.com/d-theus/CaffeineDrivenRubyist

Conflicts:
	.gitignore