commit promyokMessage
commit gitingnore
fix conflict .gitignore
Merge branch 'chompoo-master'