add gitignore
Merge branch 'work-20140225'