styling
styling
Merge branch 'master' of https://github.com/getfetch/fetch

Conflicts:
	views/index.html
styling
cleanup