Removed some shit in main.
Added a more sofisticated fps counter and changed some things in cmake file.
Merge conflict solved in main