Merge branch 'master' of https://github.com/Stryker/NV-AIS-Competetive

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/Stryker/NV-AIS-Competetive

Conflicts:
	.DS_Store