init
1
add reducer
Merge branch 'master' into dev