dd
Merge branch 'master' of https://github.com/WPiotr/eWyborySzkieletory

Conflicts:
	MainApp/views.py