Added main loop
They see me, mergin!
Merge branch 'master' of https://github.com/valentinp/aer1513project