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

Conflicts:
	kaizen/logs/app.log
	kaizen/target/classes/META-INF/maven/kaizen/kaizen/pom.properties