Merge branch 'master' of github.com:dhbikoff/AndroidBreakoutScala

Edit commit message
Merge branch 'temp'