Update main.cpp
Update main.h
Merge pull request #2 from muddafudda/dev

Dev