removing files from version control
Merge branch 'master' of https://github.com/Nineage/Kaze
Merge branch 'master' of https://github.com/Nineage/Kaze

Conflicts:
	config/custom.css
done
Merge branch 'master' of https://github.com/Nineage/Kaze