hope this works
Merge branch 'master' of https://github.com/KevZho/xamulator

Conflicts:
	framework/views/newtest.jade