synching to the lottie
Merge branch 'project4' of https://github.com/ldowson/cs140winter2014 into project4
synched, pushing hack