fixed the number signs on calculator
git
merge conflicts
merge fix
added the checkboxes