finishing 1.5
Merge branch 'master' of https://github.com/bauer90/laughing-octo-cyril

Conflicts:
	main.c