08/11/14 no idea what I am doing
08/11/14 resovled conflicts