2nd commit (manually)
Initial commit of Pragmatic Studios Ruby Programming class
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Chapter 11: Separate Source Files