?
?
?
?
fixed merge conflict
fixed mergin error
commiting to pool
fixing merg errors
fixed plus.h and adding subtractButton.h
Fixing merging error