Made waves similar size, re-indented gui.pde

Scaled waves in setcards.asy so that they are the same size as diamonds and ovals
Fixed indentation in gui.pde
Modified makefile so that images are generated only once