Changes for request proxy
add log.txt to ignore
resolved merge issue
Merge branch 'master' of https://github.com/LijeeshK/adv-finder.git

Conflicts:
	pom.xml
	src/main/java/com/inmobi/hackathon/advfinder/Main.java