Merge remote-tracking branch 'upstream/master'

Conflicts:
	static/style.css
Made the same as in tomi git
local server
changes
see
Added LocalServer
Added function calls
Added function calls
Merge branch 'master' of https://github.com/tomikyos/discard into localDiscard
Added few missing function calls
Card id fixed
Merge pull request #2 from tzeoliver/localDiscard

Local discard