Finished and added more test for 18a and 18b.
Merge branch 'master' of https://github.com/huypham612/cse131_winter14