Merge branch 'master' of https://github.com/epiggy001/Tequila

Conflicts:
	MVC/MVC.js
	test/MVC_test.js
Merge branch 'master' of https://github.com/epiggy001/Tequila