Edited title
fix title
Fix bugs as of 8/5/13 for hwk 6
title kitteh