hw02 pull request (Adrian Bautista + Kevin Shiiba)

@adrianbautista + @shiiba