moved column to the right bleeping place
fixed conflict
Merge pull request #206 from Useful-Innovation/johans-fixes

blä