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

Conflicts:
	calcs/src/com/example/calcs/MainActivity.java
added button methods
changed processoperation method
Merge branch 'master' of https://github.com/riklas/Claculate.git

Conflicts:
	calcs/src/com/example/calcs/MainActivity.java