added files
merge conflict files
Merge branch 'master' of https://github.com/jaybeesarmiento/akma