Fixes #3 (Coding Style Guidelines)
Merge branch 'ticket3' into dev
Merge branch 'dev' of microfluidics.utoronto.ca:dmf_control_board into dev