test
Merge branch 'master' of https://github.com/nimmicv/YELP

Conflicts:
	kaizen/logs/app.log
	kaizen/src/main/resources/assets/js/home.js
	kaizen/target/classes/META-INF/maven/kaizen/kaizen/pom.properties
	kaizen/target/classes/assets/js/home.js