Codestyle cleanup (main.cpp)
Merge commit 'a7d49da' into merge3

Conflicts:
	src/main.cpp