Add initial file
Add if clause and float
Add if clause and float
multiplication added
some comments at the top
Merge branch 'mult'

Conflicts:
	calc.py
some comments at the top