link styling
resolving merge conflict
Merge branch '2014' of github.com:kellyalb/nerdsummit into 2014