Solved merge conflict
Merge branch 'master' of github.com:mikeville/group_swampface