missing ;; in case statement
Merge branch 'master' into junkhacker-master
Merge branch 'master' of github.com:junkhacker/fogproject into junkhacker-master
Merge branch 'master' of github.com:mastacontrola/fogproject into junkhacker-master
Fix conflict.