DICKTESTING!
Merge branch 'master' of https://github.com/GiraffDK/FOG.git