added some stuff
Merge pull request #26 from We-Know-Fun/master

added some stuff