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

Conflicts:
	src/main.cpp
mainstuff ....
added
\n