Added percol and customized my theme
Merge conflict