(use "git reset HEAD <file>..." to unstage)
	Minimum function working
	modified:   index.html
	modified:   tupiPaper.js
Merge branch 'master' of https://github.com/xtingray/tupi.web

Merging branches