Added CodeShip.
Merge branch 'master' into group-grading-styling
Merge pull request #41 from wilchandler/group-grading-styling

Group grading styling
fixing merge conflicts