new changes
new changs
conf
remove our and add 1.jpg
merge master