updating files to submit for class project on 05-24-2014