modified:   .gitignore
modifed makefile
Merge branch 'slepc' of https://github.com/lancerd/HW-Code into slepc

Conflicts:
	makefile