merged
Merge branch 'master' of https://github.com/PhoenixRockit/calc

Conflicts:
	main.php