git ignore
temp commit
.gitignore
Merge branch 'master' of ssh://github.com/atarba/mdm

Conflicts:
	.gitignore