merge
Merge branch 'master' of https://github.com/jemah/enchord
merge
Merge branch 'master' of https://github.com/jemah/enchord
merge
fix merge errors
upvote and band initial layout
Merge branch 'master' of https://github.com/jemah/enchord