12/3/14 committing before pulling develop