Assignment 2 Commit

Committing assignment 2 functions by mellowothello.