Felipe Nunez Assignment 2

Felipe Nunez, Assignment 2, tested and working.