Added A git ignore file
Merge branch 'master' of https://github.com/team-portfolio/basis

Conflicts:
	.gitignore