shits working now
Merge pull request #13 from awertman/Last_Minute_Fixes

shits working now