clean up text a bit
adds 03 challenge and cleans up text
fix merge