beels/merge-testing — pull request #1 by abeels (2012-10-16 16:34:52+00:00)
Title: Update src/main.cpp

Add standard main.cpp content.