just testing a commit to Gitlab.
changing the database credentials to match my macbook.
setting up the server
Merge branch 'master' of http://misalpav.local//frishi/personal-website
cleaning up