from work
Merge branch 'master' of github.com:ssteele/skeleton_codes

Conflicts:
	bash.bash
	mysql.sql