lalaaa
lalss
hi
hehe
hihi
Merge branch '131015'

Conflicts:
	bin/main
ala
aladin
binensky
main.c
aladin
readme upload
readme upload
Merge branch 'master' of https://github.com/binensky/Dijkstra
binensky
alala
Merge branch 'master' of https://github.com/binensky/Dijkstra
Merge branch 'master' into 131015
HB jjang
Merge branch 'master' of https://github.com/binensky/Dijkstra