Merge pull request #4 from sunnyLA4/work

project modified into asp
Merge pull request #5 from sunnyLA4/work

old files deleted
new files updated
new files updated
Merge remote-tracking branch 'origin/master'
few conflicts removed
site.master fix