JGEN
Merge branch 'master' of github.com:four04/four04.github.io

Conflicts:
	.gitignore

Conflicts resolved.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>