gitignore
Merge branch 'master' of https://github.com/Raslucas/Nadine-theme

Conflicts:
	.gitignore
	codekit-config.json