Merge branch 'master' into robert
Additional style changes
Merge branch 'robert' of github.com:starkindustries/leadersbook into robert

Conflicts:
	.gitignore
Merge branch 'zp'
Merge branch 'robert'
Merge branch 'master' into zp