merged to remote and resolved conflict
Merge branch 'master' of github.com:skoirala/Haku16100