git says i made changes and need to merge
wip
Merge branch 'master' of github.com:conrad-vanl/seal-team-pt
socialized news page
added stuff