Added functions
Merge branch 'master' of https://github.com/xtingray/tupi.web

Conflicts:
	index.html

	Working changes