Merge branch 'master' of github.com:ctfs/write-ups

* 'master' of github.com:ctfs/write-ups:
  some small fixes
  CSAW CTF 2014: link to some write-ups
  some small fixes
  some small fixes
  some small fixes
  some small fixes
  some small fixes
  some small fixes