front end
merging conflicts fixed
Merge branch 'master' of https://github.com/Fruitify/fruitBin