pushing, finished my part of the DESIGNDOC
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
ok, now im really pushing