Signed-off-by: Your Name <email@example.com>
Merge branch 'master' of github.com:orktj2012/XS

Conflicts:
	exec7.html

Signed-off-by: Your Name <email@example.com>