Initial commit
Added the default project website template.
Fixed the merge error