temp
Merge branch 'master' of https://github.com/jfreedom/development

Conflicts:
	bashrc