Updates for 03-02-2013

Finalizing code for competition