Changed he tracking for retina display
deleted o-files
Solved conflict in gitignore
solved conflict in main.cpp
Solved merge conflict in .gitignore
Merge branch 'oo-ver' of github.com:kbladin/Modeling-project into oo-ver
Merge branch 'oo-ver' of github.com:kbladin/Modeling-project into oo-ver
Tärning