nandedaro
Merge branch 'master' of https://github.com/kazukimatsu/Calculator

Conflicts:
	main.c
tekitou