riotry directory and riotry framework
added DS_Store
merge conflict DS_Store