commit
Merge branch 'master' of https://github.com/kksd/weSac

Conflicts:
	python/calculator.pyc