Merge branch 'rough'
updated font awesome
Merge branch 'master' of https://github.com/superfuji57/superfuji57.github.io