initial commit from local git
first commit
Merge branch 'master' of github.com:allenloves/fmCalculator
Merge remote-tracking branch 'origin/master'