Merge pull request #1 from mrennema/master

PULLLLLLL
newtthingsa
This is the good one brovakiin.
BIG UPDATE, EVERYTHING CHANGED