* Added new search method
 * Added <String, String> to Map declaration
 * Added <String, String> to HashMap initialization
 * Changes in createMapping method(conditions and new way   to initiate key and value variables)
Merge remote-tracking branch 'origin/master'