Merge pull request #31 from kaiprt/partial_refactor

@kaiprt Basic refactor (second draft) looking good!
Changing a naming variable to be more specific.
Merge branch 'master' of https://github.com/woodchucks-2014/SuprStar.me into partial_refactor
Merging to keep branches from breaking.