Merge branch 'master' into shnupbups
Merge pull request #50 from OmgImAlexis/master

Pulling from master.
Merge pull request #51 from OmgImAlexis/shnupbups

Shnupbups