trying to make a merge conflict happen.
trying to make merge confilict.
fixed merge conflict.
Made calc use 3 numbers.
Merge git://github.com/ahmadsarah333/JavaAndGit into ahmadsarah333-master
Merge branch 'ahmadsarah333-master'