Added icons
Codekit config
Merge branch 'master' of github.com:djmosc/nazaninrosematin

Conflicts:
	config.codekit
Changed icons
Merge branch 'master' of github.com:djmosc/nazaninrosematin