fixed -o flag
Merge branch 'master' of http://github.com/dluces/cmput415-project