added main.cpp and Makefile
No more conflicts
Merge branch 'master' of https://github.com/coderextreme/smolder

Conflicts:
	src/main.cpp