Resolved Conflicts occured in reservation app (1455)

 -prettified code
 -removed unused scripts
 -removed console logs
 -resolved code conflicts