Final code update for competition 12-6-2014

FINAL