Recent theoretical and experimental advances mean that it is now possible to control physical systems at the quantum level. Indeed, developments in quantum technology provide strong motivation for the feedback control of quantum systems. This paper will discuss both measurement feedback and coherent feedback control for quantum systems. Measurement feedback involves conditioning on the measurement information, and so we describe the Belavkin quantum filter and its use in quantum control. In contrast, coherent feedback does not involve any measurements, and we discuss some recent results on coherent feedback control.