estado actual de lo que esta en el servidor
Merge branch 'master' of https://github.com/andresazp/marina_html

Conflicts:
	css/SWZ721T.TTF
	css/SWZ721TI.TTF
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.css
	css/index.css
	css/main.css
	css/swissl.ttf
	css/swissli.ttf
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	img/logo.png
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/index.js
	js/jquery.cookie.js
	js/jquery.min.js
	js/jquery.serialize-object.min.js
	js/marina.js
	login.html
	newschedule.html
	schedule.html