zielony
Merge branch 'master' of https://github.com/Anja-ruby/about

Conflicts:
	public/style.css