bah
 Merge conflicts
Älg med horn
Merge branch 'master' of github.com:Daladevelop/BashThatDev-Frontend