* 설정정보 정리
Merge branch 'master' of github.com:egoing/fbgp

Conflicts:
	main.py