eliminate two operators in a row
Merge branch 'issue4'
Merge branch 'master' into issue2

Conflicts:
	Calculator/ViewController.swift