Changed include paths so that it works with default pkg-config output
Merge branch 'master' of github.com:team1306/OMAR