lab 3 commit Oct 19 2014
lab 3 commit Oct 19

Signed-off-by: Hayden Lowes <hlowes@sasktel.net>
Lab 3 commit Oct 19

Signed-off-by: Hayden Lowes <hlowes@sasktel.net>
Merge branch 'master' of https://github.com/hpvista/Lab3