tmp folder
Merge branch 'master' of github.com:kevinhowbrook/beaumontnathan.com
fix master
sync and resolve conflicts