Merge branch 'master' of github.com:FootprintsTeam/FootprintsPrototype

Conflicts:
	Main.html

Signed-off-by: thangpc <pcthang1992@gmail.com>