fixed untracked items
update gitignore
Merge branch 'master' of https://github.com/catsky/phoenix-flower