Remove extra html
Moving things
Merge branch 'master' of https://github.com/ltacon/dearp

Conflicts:
	results.html
	templates/location.html
type
abc
Merge branch 'master' of https://github.com/ltacon/dearp