front end
merging conflicts fixed
Merge branch 'master' of https://github.com/Fruitify/fruitBin
Merge branch 'master' of https://github.com/Fruitify/fruitBin
clean up of index.html files
front end
merging conflict fix. require config.php vs require config.example.php