updated layout
Merge branch 'master' of https://github.com/riklas/Claculate.git
updated activity_main.xml
added back.xml for borders
updated