Small stuff
Merge branch 'master' of https://github.com/brrybnds/tradepaper

Conflicts:
	login.html