website soweit fertig
Merge branch 'hotfix/0.01.000'
Merge branch 'master' of github.com:bastian-meier/bastianmeier.de
removed db access from home controller
meta tags and favicon added
Merge branch 'hotfix/0.03.000'
disabling the way to large bg image
added a second bg image
Merge branch 'hotfix/0.06.000'
back to top link added
back to top link added
home view updated
home view updated
kontak view updated
kontak view updated
config.php removed
added secretConfig (also added to .gitignore)
Merge branch 'hotfix/0.07.000'
solving merge conflict