No pistachios
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt
Clean slate
Merge sample to master
Merge remote-tracking branch 'origin/alfonso' into aramis
Merge remote-tracking branch 'origin/aramis'

Conflicts:
	readme.txt