Signed-off-by: Jongyeob <x9bong@hanmail.net>
Merge branch 'master' of git://github.com/Jongyeob/fitcasa

Conflicts:
	ex.py

Signed-off-by: Jongyeob <x9bong@hanmail.net>