added
updated

Signed-off-by: jzegan <jzegan@gmail.com>
update, link, source

Signed-off-by: jzegan <jzegan@gmail.com>
Merge branch 'master' of https://github.com/joshz/joshz.github.com

Conflicts:
	doc/writeup.html