setup bootsrap
add new model called news
pull
fix conflict