New

Conflicts:
	StationRedactor.pro
	StationRedactor.pro.user
	blockrelay.cpp
	blockrelay.h
	contacts.cpp
	contacts.h
	mainelement.cpp
	mainelement.h
	mainwindow.cpp
	mainwindow.ui
	widget.cpp
	widget.h
	widget.ui
ver 0.13

Conflicts:
	StationRedactor.pro.user
	widget.cpp
	widget.h