update from JDK 1.6 to JDK 1.7
change SQUARE to Circle
update to intelliJ IDE
Merge branch 'master' of https://github.com/caodangtinh/DSP_Shape