Added test 2 solutions
Merge branch 'master' of github.com:PNHilfinger/61a-sp14-website