Iat265 spring2013

Here is the updated pull request Sunday 2:30