grunt edits
Merge branch '2014' of github.com:garrying/OCADU-Illustration-Theme into 2014