Add heruku and glokum
Merge branch 'master' of https://github.com/AndreasW329/setup