Moved files and cleaned a few things
Merge branch 'master' of https://github.com/wilzh40/SBSkeleton