Added priority queue functionality
Merge branch 'master' of github.com:michboon/comp2014