removed main.cpp from version control
Merge branch 'master' of github.com:G-Node/pandora