this is my second commit trying to figure out how to merge my branch with Kat's branch
commiting

9/3/14 4:34