modified:   .gitignore
Merge branch 'master' of https://github.com/cranon/gcm-1d

Conflicts:
	body1.txt
	nbproject/private/private.xml

	modified:   body1.txt
	modified:   launcher.py
	deleted:    nbproject/configurations.xml
	deleted:    nbproject/private/Default.properties
	deleted:    nbproject/private/configurations.xml
	deleted:    nbproject/private/private.xml
	deleted:    nbproject/project.xml
	modified:   src/Mesh.cpp
	deleted:    "\320\255\320\275\321\202\321\213\321\200-\320\277\321\200\320\260\320\271\320\267/1.7e-8, 100, \321\203\321\201\320\275.avi"
	deleted:    "\320\255\320\275\321\202\321\213\321\200-\320\277\321\200\320\260\320\271\320\267/1.7e-9, 1000, \321\203\320\262\320\265\320\273\320\270\321\207 \321\201\320\273\320\265\320\262\320\260 \320\275\320\260\320\277\321\200\320\260\320\262\320\276.avi"
	deleted:    "\320\255\320\275\321\202\321\213\321\200-\320\277\321\200\320\260\320\271\320\267/1e-9 , 1000, \321\203\320\262\320\265\320\273\320\270\321\207.avi"