templates
Merge pull request #24 from czx0619/dev

Dev
merge the prototype to osslab
merge codes
modify frontend to add javascripts to call the rest api
complete the demo
Merge pull request #25 from juniwang/dev

complete the major overflow for flask experiment
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	osslab/src/app/templates/third.html