Merge pull request #39 from OmgImAlexis/shnupbups

Fixed more stuff
Merge pull request #40 from OmgImAlexis/shnupbups

Removed unused and unneeded files.
Merge pull request #41 from OmgImAlexis/shnupbups

Fixed even more stuff
Changed Stuff
Merge pull request #42 from OmgImAlexis/test

Changed Stuff
Merge pull request #43 from OmgImAlexis/master

p