Updated TODO
Updated TODO
Added /setup page (in progress)
Merge branch 'master' of https://github.com/phanect/PGPServer

Conflicts:
	Todo.txt