test
Merge branch 'master' of github.com:oskmkr/oskmkr.github.com

Conflicts:
	articles/JavaScript-Design-Patterns.html