aa

Signed-off-by: LeeJeongHo <ljh721635@huray.net>
Merge branch 'master' of https://github.com/LeeJeongHo/curay_jeongho

Conflicts:
	lib_proj/HoloGraphLibrary/bin/holographlibrary.jar

Signed-off-by: LeeJeongHo <ljh721635@huray.net>
gitignore add

Signed-off-by: LeeJeongHo <ljh721635@huray.net>