Edit gitignore to ignore junk mac file system
Merge branch 'master' of github.com:phoorichet/wheretomigrate

Conflicts:
	.DS_Store