Remove twitter
Merge
Merge branch 'master' of github.com:jasoncta/ASIS-website