Bug fixing
buges
Merge branch 'lab3'

Merge newest changes
Removed lots of debug output