assignment 2 submission

First commit. Tested and working.