work on minor savedInstanceState
fix merging problem on MainActivity.java
Merge branch 'master' of https://github.com/dal052/snowman