merging...
Merge branch 'master' of https://github.com/Aslai/Frog-Lies

Conflicts:
	main.cpp