change to use fragment
Merge branch 'master' of https://github.com/CodePathFuntastic/Team10