in prog
Merge branch 'master' of https://github.com/morengab/creme-brulee
shortcut creation in prog
Merge branch 'master' of https://github.com/morengab/creme-brulee

Conflicts:
	db/macadamia_cluster_02_2013-12-08.sql