first local commit branch style
second commit branch style
second commit branch master
Merge branch 'style'

Conflicts:
	webapp/anekdots/controllers/category.php