Update main.cpp

Ho ho ho
Yoyo commit
Merge branch 'master' of https://github.com/efux/arpg

Conflicts:
	main.cpp

Merged the file