Fixed contexts.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git@github.com:DjBushido/itcs4180.git
Merge branch 'master' of git@github.com:DjBushido/itcs4180.git
Test code added.