Merge branch 'master' into dev
adds config file for testing
Signed-off-by: Sho Nakatani <lay.sakura@gmail.com>
Merge branch 'dev'