merge
search
logo, Search template
Merge branch 'master' of github.com:zetahernandez/book-identification

Conflicts:
	src/main/java/com/book/identification/Main.java