add new contents of website
crate README.md
merge conflict
Merge branch 'master' of https://github.com/smvdu/resurgence-website
merge conflict

 branch 'master' of https://github.com/smvdu/resurgence-website into temp
Merge branch 'temp'
merge conflct
Merge branch 'master' of https://github.com/KodeKracker/resurgence-website
merge condlifct
Merge pull request #10 from KodeKracker/master

crate README.md