Add locale
.gitignore
Merge branch 'master' of github.com:laurilehmijoki/dotfiles

Conflicts:
	.gitignore