schedule tasks running
Merge branch 'master' of http://github.com/rsoutelino/rsoutelino

Conflicts:
	static/images/siodoc_full.png
	static/images/siodoc_tmp.png
	static/images/tide.png
updated gitignore
Merge branch 'master' of http://github.com/rsoutelino/rsoutelino
added wave parameters plot
pendrive sync: ieapm internet issues