asdasda
Merge branch 'master' of https://github.com/zarie/apka into psuminski

Conflicts:
	app/views/users/show.html.haml
Merge branch 'master' into psuminski
Merge branch 'master' of https://github.com/zarie/apka into psuminski
poprawka
Merge branch 'master' of https://github.com/zarie/apka into psuminski
Merge branch 'master' into psuminski
licznik zaproszen
Merge branch 'psuminski'