Finished font loading
Merge branch 'master' of github.com:Jeaye/q3