12/01/14 dauji and taylor combined project

combining dauji/taylor work