Fixed some bugs that popped up for some reason due to the
synchronization
Merge branch 'master' of https://github.com/KProskuryakov/IDT-OHS1-Winter-2013.git
Merge branch 'master' of https://github.com/KProskuryakov/IDT-OHS1-Winter-2013.git
Test