Add CTF and Athc0n info
Merge branch 'master' of https://github.com/echothrust/athcon-ctf