fixed bugs
Merge branch 'Tarek-pt4' of https://github.com/CMPUT301W14T04/Team04Project into Tarek-pt4