Added main.cpp
Merge branches 'develop_jason' and 'develop' into develop