Make faces small on small devices...
Fix merge conflicts
Merge branch 'master' of https://github.com/N4SJAMK/N4SJAMK.github.io