f
Reverted the reverted

I hate github
Merge branch 'master' of https://github.com/victorstrandmoe/HONY-John-Vic