buuuuu - chciałeś komita to kurwa masz!!!!111 * 9001
Merge branch 'master' of github.com:radekj/inging

Conflicts:
	inging/inging/settings.py
some templates kurwa, drugi komit