hello
Merge branch 'master' of https://github.com/jackierose/CSlab

Conflicts:
	calc.py
 my commit yeah