Initial commit for development branch
New change by HT(local)
handled it
kept mine
kept my changes
finally keep my changes
No, keep my changes!
Added !
some more changes
final changes for v1.1
Merge remote-tracking branch 'origin/development'