Merge branch 'master' of https://github.com/digiguru/brackets-xunit

Conflicts:
	main.js
Resolved merge
Done