add a.php by test1
modify README.md
modify .gitignore
add a.php by test1
merge from master
modify README.md
modify .gitignore
Merge branch 'test11' of github.com:thomasfu3/firday into test1

Conflicts:
	README.md
add jjj file by master