FLASH
Merge branch 'master' of https://github.com/ninadang/MarathonSearch

Conflicts:
	css/styles.css
	index.html
Merge branch 'master' of https://github.com/ninadang/MarathonSearch