updated
Merge branch 'master' of https://github.com/riklas/Claculate.git

Conflicts:
	calcs/src/com/example/calcs/MainActivity.java
Merge branch 'master' of https://github.com/riklas/Claculate.git
updated
Merge branch 'master' of https://github.com/riklas/Claculate.git

Conflicts:
	calcs/src/com/example/calcs/MainActivity.java
almost finished!