Fixes

Fix .gitignore
Merge branch 'gui' of https://github.com/Axmill/The_Calculator_Project into gui
Quick fixes, because .gitignore was broken.