Overhauled main.cpp
Merge pull request #1 from ArnoVanKessel/master

Overhauled main.cpp