design_first_version
merge
Merge branch 'master' of https://github.com/marce155/stockticker-client

Conflicts:
	Index.html