Tidy up .gitignore
Merge branch 'division', implementing support for integer division in calc.rb