Added changes for demo
Merged main.cc
Conflicts:
	src/main.cc