Trying to merge
Merge branch 'master' of github.com:lazyhomework/hw-428

Conflicts:
	Makefile