Updated website from dropbox
Merge branch 'develop'
Fixed some typos
Merge branch 'develop'
Built website