Merging of fall 2012 final project E702