added new stuff
Merge pull request #1 from ThatITNinja/mybranch

added new stuff