Merge pull request #18 from TEAM2-ISC567-FALL14/master

Merge pull request #11 from eas604/master
Subskill/Outcome intersect page implemented
Merge branch 'master' of https://github.com/eas604/ISC567Fall2014
Merge pull request #13 from eas604/master

integration 11-26