Merge branch 'master' of github.com:jodersky/condor

Conflicts:
	README.md

1 files changed, 3 insertions, 2 deletions

diff --git a/README.md b/README.md
index a8e954a..a26152a 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,10 @@ This repository contains files related to the quadcopter model. Checkout the [fu
 
 ## Projects created/ported for Condor
 
+Project | Progress
 ------ | --------
 Controller board [trifle](https://github.com/jodersky/trifle) | ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg)
-Pilot firmware [PX4](https://github.com/jodersky/px4-firmware) (porting forkk | ![wip](https://img.shields.io/badge/progress-wip-orange.svg)  |
+Pilot firmware [PX4](https://github.com/jodersky/px4-firmware) (porting fork) | ![wip](https://img.shields.io/badge/progress-wip-orange.svg)
 Real-time OS [NuttX](https://github.com/jodersky/px4-nuttx) (porting fork) | ![wip](https://img.shields.io/badge/progress-wip-orange.svg)
 Virtual cockpit [VFD](https://github.com/jodersky/vfd) | ![milestone](https://img.shields.io/badge/progress-milestone-green.svg)
 MAVLink-to-Scala code generation [SBT-MAVLink](https://github.com/jodersky/sbt-mavlink) | ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg)
@@ -25,7 +26,7 @@ Progress badges indicate the current state of usability of the project
 
 - ![alpha](https://img.shields.io/badge/progress-alpha-brightgreen.svg): most features available
 - ![milestone](https://img.shields.io/badge/progress-milestone-green.svg): some functionality available
-- ![wip](https://img.shields.io/badge/progress-wipl-orange.svg): not functional
+- ![wip](https://img.shields.io/badge/progress-wip-orange.svg): not functional
 
 ## Other pojects of interest
  - Communication protocol [MAVLink](https://github.com/mavlink/mavlink)