[2013/  / ] Sline

Commit3 c3
Merge branch 'branch2' of https://github.com/bighilljae/gitTestW5

Conflicts:
	hello.c

둘 다 합쳤다. hello A,hello B 둘다 합침 ㅇㅇ.