Simple website v1.0
Merge branch 'develop'