Merge pull request #59 from OmgImAlexis/master

Merge
Added shit, fixed shit.
Merge pull request #60 from OmgImAlexis/shnupbups

Shnupbups