Ignore everything except mvc and git files
Merge remote-tracking branch 'origin/Programming' into Programming

Conflicts:
	.gitignore