change structure
change structure
Merge branch 'master' of github.com:hieu-h-nguyen89/conf

Conflicts:
	bash/lab/.bashrc
	bash/lappy/bash_history
	bash/lappy/bashrc