initial import
update
clean
Merge branch 'master' of https://github.com/radiganm/environment

Conflicts:
	home/.bashrc