Merge branch 'master' of https://github.com/KamalChaya/WebDeck

Conflicts:
	card_interface_revised.html
	interface.css
updating files