gitignore
Merge branch 'master' of https://github.com/lgbennetts/CITEPH-64-2012

Conflicts:
	.gitignore