merging conflict and fixing mobile bugs
Merge branch 'master' of https://github.com/sbeverly/sbeverly.github.io