a
Merge branch 'master' of github.com:jyori112/HttpTest

Conflicts:
	Format/RequestFormat.txt