makeing apache and local running
Merge branch 'master' of https://github.com/schneith/caffeine