css
poprawki
Merge branch 'master' of https://github.com/mossowski/my_gists

Conflicts:
	log/development.log