Merge branch 'master' of https://github.com/wyh267/algorithms

Conflicts:	Makefile

Author: wyh267

Makefile

@@ -9,6 +9,7 @@ INCLUDEDIR = -I./include -I.
 DEPS = 
 LIBS = -lm
 PROGRAMS = m_based \
+<<<<<<< HEAD
 integer_demo \
 insertion_sort_demo \
 radix_sort_demo \
@@ -17,6 +18,55 @@ PROGRAMS = m_based \
 merge_sort_demo \
 sort_demo \
 bubble_sort_demo
+=======
+random_select_demo \
+ - hash_multi_demo \
+ - hash_table_demo \
+ - double_linked_list_demo \
+ - stack_demo \
+ - queue_demo \
+ - priority_queue_demo \
+ - prime_test \
+ - universal_hash_demo \
+ - perfect_hash_demo \
+ - binary_search_tree_demo \
+ - rbtree_demo \
+ - heap_demo \
+ - interval_tree_demo \
+ - dos_tree_demo \
+ - skiplist_demo \
+ - lcs_demo \
+ - prim_mst_demo \
+ - directed_graph_demo \
+ - undirected_graph_demo \
+ - dijkstra_demo \
+ - bellman_ford_demo \
+ - graph_search_demo \
+ - edmonds_karp_demo \
+ - astar_demo \
+ - hash_string_demo \
+ - bitset_demo \
+ - bloom_filter_demo \
+ - sha1_demo \
+ - huffman_demo \
+ - word_seg_demo \
+ - md5_demo \
+ - trie_demo \
+ - simhash_demo \
+ - imath_demo \
+ - random_demo \
+ - k-means_demo \
+ - kmp_demo \
+ - heap_sort_demo \
+ - kruskal_mst_demo \
+ - LRU_cache_demo \
+ - base64_demo \
+ - max_subarray_demo \
+ - disjoint-set_demo \
+ - relabel_to_front_demo \
+ - btree_demo \
+sort_demo
+>>>>>>> fe93cf4a8b1e5ae86e7bf4c70d88d03bb3b0d654
 
 all: $(PROGRAMS)