updated website
Merge branch 'master' of github.com:sirrice/sirrice.github.io
updated website