moved fonts to root directory
Merge remote-tracking branch 'upstream/master'

merging master.
changed index
made some changes
resolved confict