init
Merge remote-tracking branch 'shield/master'

Conflicts:
	README.md
Merge remote-tracking branch 'shield/master'

Conflicts:
README.md