Removed dips completely from the project.
Merge branch 'master' of https://github.com/JackWoot/CSC2015