BY JFAM 5-21-2013
Commit JFAm
Merge branch 'JFAM' of github.com:masterinho52/nxjbs

Conflicts:
	Form1.cs