Added default line and modified to be 1.2 and 2.2 as well as 10000 flows
Merge branch 'master' of https://github.com/richardhsu/cs244-14-rcp