quickfix
Merge branch 'develop' of https://github.com/thortek/dgm4790-spring2014 into develop
Just another quickfix