Changed file organization
Treap is replaced by Splay tree, some compile options are added, some little code-view changes
Compilation options change
Merge branch 'master' into splay_tree --- changed Makefile

Conflicts:
	Makefile