upload
Merge branch 'master' of https://github.com/carotrejosg/mobile_sc

Conflicts:
	css/demo.css
	css/style.css
	index.html