changed position representation to be integer based
Merge branch 'develop' of https://github.com/pulsaral/2Pac into develop
resolved conflicts