Ignore markup and related files
Merge branch 'master' of ssh://github.com/MacEggSurvey/Egg_Production

Conflicts:
	.gitignore