pierwsza wersja
finish him
3
Merge branch 'master' of https://github.com/ArkadiuszD/Wpisy

Conflicts:
	app/views/layouts/application.html.erb~