[develop]

- Dirty things
	modified:   PlasmaSimulation/HybridSimulation/.gitignore
	modified:   PlasmaSimulation/HybridSimulation/HybridSimulation.sln
	modified:   PlasmaSimulation/HybridSimulation/HybridSimulation.v11.suo
	modified:   PlasmaSimulation/HybridSimulation/HybridSimulation/.gitignore
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Arguments.h
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Debug.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Diagnostic.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Functions.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Grid.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Grid.h
	modified:   PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj
	modified:   PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj.filters
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/HybridSimulation.vcxproj.user
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Initialize.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/LIB.h
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Main.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/MoveSpecies.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/Plasma.cpp
	deleted:    PlasmaSimulation/HybridSimulation/HybridSimulation/UpdateEBField.cpp
	new file:   PlasmaSimulation/HybridSimulation/HybridSimulation/main.cpp
	new file:   PlasmaSimulation/HybridSimulation/HybridSimulation/parameters.h
	modified:   PlasmaSimulation/HybridSimulation/Makefile
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/-ux/cleaner.py
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Appendix.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Makefile
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Proposal.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Section1.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Section2.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Section3.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/Title.tex
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/Kinetic-Simulation.png
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/cpu-gpu.jpg
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/gpu-computing-image.png
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/gpu-vs-cpu.jpg
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/logo.jpg
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/meshgrid.jpg
	deleted:    PlasmaSimulation/HybridSimulation/doc/Proposal/pics/pics1-1.png
	deleted:    PlasmaSimulation/HybridSimulation/doc/Refs/Eigen.html
	modified:   PlasmaSimulation/HybridSimulation/include/Eigen
	modified:   PlasmaSimulation/HybridSimulation/include/GL/freeglut.h
	modified:   PlasmaSimulation/HybridSimulation/include/GL/freeglut_ext.h
	modified:   PlasmaSimulation/HybridSimulation/include/GL/freeglut_std.h
	modified:   PlasmaSimulation/HybridSimulation/include/GL/glut.h
	modified:   PlasmaSimulation/HybridSimulation/lib/freeglut.lib
	modified:   PlasmaSimulation/HybridSimulation/lib/x64/freeglut.lib
	modified:   PlasmaSimulation/HybridSimulation/moe.jpg
	modified:   PlasmaSimulation/HybridSimulation/tools/bin/freeglut.dll
	modified:   PlasmaSimulation/HybridSimulation/tools/bin/x64/freeglut.dll
	modified:   PlasmaSimulation/HybridSimulation/tools/clean.bat
	modified:   PlasmaSimulation/HybridSimulation/tools/cleaner.py
	modified:   PlasmaSimulation/HybridSimulation/tools/makefile.py
	modified:   PlasmaSimulation/HybridSimulation/tools/makelink.py
	modified:   PlasmaSimulation/HybridSimulation/tools/module.py
	modified:   PlasmaSimulation/HybridSimulation/tools/module.pyc
	modified:   PlasmaSimulation/HybridSimulation/tools/prework.bat
	modified:   PlasmaSimulation/README.md
	deleted:    main.cpp
[develop]

- Dirty things
	modified:   HybridSimulation.sln
	modified:   HybridSimulation.v11.suo
	modified:   HybridSimulation/.gitignore
	new file:   HybridSimulation/Debug.cpp
	modified:   HybridSimulation/HybridSimulation.vcxproj
	modified:   HybridSimulation/HybridSimulation.vcxproj.filters
	new file:   HybridSimulation/HybridSimulation.vcxproj.user
	new file:   HybridSimulation/input.h
	modified:   HybridSimulation/main.cpp
	modified:   HybridSimulation/parameters.h
	modified:   Makefile
	modified:   include/Eigen
	modified:   include/GL/freeglut.h
	modified:   include/GL/freeglut_ext.h
	modified:   include/GL/freeglut_std.h
	modified:   include/GL/glut.h
	modified:   lib/freeglut.lib
	modified:   lib/x64/freeglut.lib
	modified:   moe.jpg
	modified:   tools/bin/freeglut.dll
	modified:   tools/bin/x64/freeglut.dll
	modified:   tools/clean.bat
	modified:   tools/cleaner.py
	modified:   tools/makefile.py
	modified:   tools/makelink.py
	modified:   tools/module.py
	modified:   tools/module.pyc
	modified:   tools/prework.bat
[develop]

- Finished the main
	modified:   HybridSimulation/Debug.cpp
	modified:   HybridSimulation/input.h
	modified:   HybridSimulation/main.cpp
	modified:   HybridSimulation/parameters.h
[develop]

- Dirty things
	new file:   CPP/PlasmaSimulation/HybridSimulation/HybridSimulation/P5.cpp
	new file:   CPP/PlasmaSimulation/HybridSimulation/HybridSimulation/calcomp.c
	modified:   CPP/PlasmaSimulation/HybridSimulation/HybridSimulation/input.h
	modified:   CPP/PlasmaSimulation/HybridSimulation/HybridSimulation/main.cpp
	modified:   CPP/PlasmaSimulation/HybridSimulation/Makefile
	modified:   F90/p5.f90
Merge branch 'develop'