init
Merge ssh://github.com/joelkay/AndroidCalc