use boostrap
edit README
Merge branch 'feature-2-columns'