Merge remote-tracking branch 'origin/master' into ubuntu12
[ubuntu 12]

- Temp
	modified:   main.cpp
[ubuntu 12]

- A PIC code is now available
	new file:   Makefile
[ubuntu 12]

- HybridPIC
	new file:   HybridPIC/...
[ubuntu 12]

- Temp
	renamed:    HybridPIC/Config -> HybridPIC/monohanai/Config
	renamed:    HybridPIC/Makefile -> HybridPIC/monohanai/Makefile
	renamed:    HybridPIC/pt_picInterface.F90 -> HybridPIC/monohanai/pt_picInterface.F90
Merge branch 'ubuntu12'
Merge remote-tracking branch 'origin/develop/ps/main'
[develop/ps/main]

- Add the setting script to ignore list
	modified:   .gitignore
[develop/ps/main]

- Temporary
	deleted:    PlasmaSimulationAlpha.vcxproj
Merge branch 'develop/ps/main' of https://github.com/seagochen/TinyProjects into develop/ps/main

Conflicts:
	PlasmaSimulationAlpha/PlasmaSimulationAlpha/PlasmaSimulationAlpha.vcxproj