Readme file
Merge remote-tracking branch 'calculator/master'