Do not track Object files
Merge branch 'master' of https://github.com/louis77/gophd

Conflicts:
	.gitignore