updates
Merge branch 'master' of github.com:ruben-s28/dsta_website