bla
Merge remote-tracking branch 'origin'
qwertyuiop
Merge remote-tracking branch 'origin'
Merge remote-tracking branch 'origin/master'
add flower to news controller