serverより
Merge branch 'master' of github.com:tluna/tluna

Conflicts:
	bash/bashrc_personalvm
	environments/linux/setup.txt
	gitconfig