fixed golf and napoleon
Merge branch 'master' of https://github.com/sachabroute/MIASHS

Conflicts:
	napoleon.py