Removed merge conflicts with heap.py
Merge branch 'priorityqueue' of https://github.com/caderache2014/data_structures into priorityqueue

Conflicts:
	heap.py