fixed merge problems
Initial commit
Merge branch 'master' of https://github.com/johannesgaa/Capa
init
Merge branch 'master' into mreps