- Added a function to check if a shift to be taken conflicts with a shift that you have already taken.
Merge branch 'master' of https://github.com/ddalgaard/P4-HP