updated gitignore
Merge branch 'master' of https://github.com/StudentLifeMarketingAndDesign/engineers-without-borders

Conflicts:
	.gitignore