git ignore
Merge branch 'master' of github.com:cc6401-skanban/skanban

Conflicts:
	.gitignore