git ignore changes
Merge branch 'master' of github.com:rors/campus-medius

Conflicts:
	.gitignore