What doing Alex
Merge branch 'master' of https://github.com/isawillbenice/learning

Conflicts:
	test