Merge pull request #1 from Doralyp/awesome-feature

changed readme file
add conflict
hot mess