Working on Designdoc
Merge branch 'project4' of https://github.com/ldowson/cs140winter2014 into project4
Done with Lottie Designdoc
Fixed doc
Merge branch 'project4' of https://github.com/ldowson/cs140winter2014 into project4
Merge branch 'project4' of https://github.com/ldowson/cs140winter2014 into project4