all of it..
Merge branch 'master' of https://github.com/jungla/jungla.github.io

Conflicts:
	index.html
old website
deleted wordpress