-
merge newFestival
-
Conflicts: new-festival/.gitignore new-festival/gulpfile.js new-festival/package.json new-festival/public/js/new-festival.js new-festival/views/partials/newfestival/newfestival_home_banner.html new-sale/.gitignore newfestival/.gitignore
