shitty test stuff, dont keep this
fixed merge conflict
bullshit commit so i can pull down
Merge branch 'master' of github.com:rkuhel/lost_tribes3
figured out some testing but still plenty to do