Finished Assignment 2

Ready for deployment!