Updated 1.8.2014 4:28
Merge of dev0.04 into master
Merge branch 'master' of git@github.com:campreilly/UnderSeaModelingLibrary.git

Conflicts:
	usml_install.html