edit
Merge branch 'master' of github.com:phananhhdnit/SEM3_ProjectASP.NET

Conflicts:
	JamesThew/www/JamesThew/JamesThew.csproj