fixed untracked files
Merge branch 'master' of https://github.com/Scrummies/scrum3

Conflicts:
	Scrum3/.gitignore