committed two files. botha re test.

gJ
resolved conflict. Merge branch 'master' of https://github.com/jiangg/MVC3DashBoard

Conflicts:
	testFile2