Merge pull request #16 from rhololkeolke/master

Reverted a merge by Rachid that deleted all of my files