newfile
Merge branch 'master' into nates
Merge branch 'nates'
Merge branch 'master' of https://github.com/PhoenixRockit/calc