Got rid of '/'. Added evalute.
Merge branch 'master' into issue2

Conflicts:
	Calculator/ViewController.swift