Changes for this week
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014.git
Fixed add/edit subskill
Manual merge of Nikhil's changes
Edited files
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014.git
Minor aspx corrections
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014.git
More corrections to aspx namespaces
Corrected project assembley name, which was broken in a prior merge
Added  close button to taker
Merge pull request #15 from TEAM2-ISC567-FALL14/master

UI updates and Add/Edit Schedule iteration
Merge pull request #10 from eas604/master

Update from team integration