init
Merge branch 'master' of github.com:iamsk/alfred4delicious

Conflicts:
	.gitignore