Add WhatFont
Fix conflict
Merge branch 'augustt198-master'

Add WhatFont