some changes
Merging with about me
Merge branch 'master' of https://github.com/bearnip/MattAndRonnie