finish refactor
finish refactor
ignore things
Merge pull request #4 from theSmaw/refactor_merge

Refactor merge