Updated.
Merge branch 'master' of https://github.com/mmahadik/milsrc

Conflicts:
	configuration_files/.bashrc