修改gitignore
重构了几处代码
resolve conflict
all views are ported to rythm