Adding all files currently developed
Merge branch 'master' of https://github.com/funkydelpueblo/cahmaker