Merge pull request #1 from paramaciej/master

Implementacja modułu bazy taboru
prices module

+ prices module (/kolstat/prices/)
+ new trains
+ "working" first step of adding a journey
Merge pull request #2 from paramaciej/master

Kolejne uaktualnienie
Merge branch 'master' of https://github.com/xneby/kolstat

+ new fixtures

Conflicts:
	kolstatapp/admin.py
	kolstatapp/models/__init__.py
	kolstatapp/static/css/style.css
	kolstatapp/urls.py
	kolstatapp/views/__init__.py
Merge pull request #1 from xneby/master

Kolstat pre-alpha 1