Function to add rectangle
Function to add track
Merge branch 'master' of https://github.com/jrsala/WebMovie

Conflicts:
	public/index.html