test commit
Merge branch 'master' of https://github.com/kdesign91/inf3-client

Conflicts:
	README.md
Merge branch 'master' of https://github.com/kdesign91/inf3-client

Conflicts:
	README.md
merge