angular-file-upload
Merge branch 'master' of github.com:shimarin/shimarin.com

Conflicts:
	netkjk/index.json