Branch1 created
added "huhu"
Naught Commit
added server config
Merge branch 'NaughtyBranch'