Convert to fragments
Merge branch 'master' of https://github.com/marakana/class-3131