get this up to github
Merge branch 'master' of https://github.com/rmceoin/safebackup

Conflicts:
	.gitignore