fixing the font face issue
Merge branch 'master' of https://github.com/MarcoMorawec/startuphackme
fixing index merge conflict