master
SR1
master
deleted .idea
merging completed
SR1
SR1
commit Server.js
Merge branch 'SR2'
SR1