Final commit - finished project submitted 5/11/14