Added parameters.yml.bak
Merge branch 'master' of https://github.com/Radio/pek-aero
IDE changes
Merge branch 'master' of https://github.com/Radio/pek-aero

Conflicts:
	.idea/pek-aero.iml
Trash deleted