times
Merge branch 'master' of github.com:stouf/test into times

Conflicts:
	calculator.c
Merge pull request #4 from kyatabe/times

times