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

Conflicts:
	calcs/res/layout/activity_main.xml
added grid view to layout