fixing all the things
Merge branch 'master' of github.com:Urthen/TeamRamrod