Update
Merge branch 'master' of github.com:nickpetty/deadrop

Conflicts:
	templates/index.html