added main and callback funcs
Resolving conflict in Main

Conflicts:
	Main.cpp

Resolved the conflict by checking both inputs, removing conflict markers
"<<<<<<<, ========, and >>>>>>>" and comiting this change.