kleinner-bash-1
Add manifesto + resolve merge conflict
2f75c73