working on proton with gsl
working on proton
add gitignore
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	gsl/proton.c
	gsl/proton.cc~
remove pyc and vim backup files
remove a.out