waiting test passed
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
some more tests pass. Infinite loops on one test, which you have to modify to pass