to pull
Merge branch 'master' of git@github.com:huypham612/cse131_winter14.git
Merge branch 'master' of git@github.com:huypham612/cse131_winter14.git
tests on functions