HTML Parsing from Upstream
Added polaroid image input support
Merge remote-tracking branch 'upstream/master'

Conflicts:
	war/index.html
Merge pull request #6 from dinesharun/master

Polaroid image addtion