Initial commit
Added the current live site  updates
Fixed conflicts
Fixed conflicts