dom sept 28, 11:56
mmm...

Merge branch 'master' of https://github.com/Zyoruk/Iconiav2

Conflicts:
	src/main.cpp
Merge branch 'master' of https://github.com/Zyoruk/Iconiav2

Conflicts:
	src/main.cpp