working bill
weird merge conflict
fixed indentation
Merge branch 'master' of https://github.com/Amakri1020/WebStore