cleaning up master branch
cleaning up master branch
Merge pull request #2 from teh-nicKLess/master-cleaned

Master cleaned