printf formatting
Merge branch 'master' of github.com:JKatzwinkel/bash

Conflicts:
	notes