Seans addition
Merge branch 'master' of https://github.com/Gannon-University/gcis634.2014.team2