keep images folder4
add child template
Merge branch 'master' of github.com:anandjeyahar/eBay-Opportunity-Hack-Blr-2014

Conflicts:
	api.py