trying to do stuff
Merge branch 'master' of https://github.com/PopescuGheorghe/heap_team

Conflicts:
	HeapSort.java
did stuff