First commit?
Merge branch 'master' of github.com:Qw4z1/agilegroup3

Conflicts:
	.gitignore