fixing stuff
Merge branch 'develop' of https://github.com/devintzoosk/devint-gitproj-test into develop