gitignore edit
Merge branch 'master' of github.com:johanna-bodnyk/meadowcampus

Conflicts:
	.gitignore