Wrote section about Firefox OS
Resolved merge conflict