rally and design
Merge branch 'master' of https://github.com/Radio/pek-aero

Conflicts:
	design/pek_calc_1.png