ignore backups directory
Merge branch 'master' of https://github.com/jessykate/modernomad

Conflicts:
	.gitignore