Update commit
Merge branch 'master' of github.com:ericirel/BusinessSite
Fixed conflicts
Merge conflicts