Merge branch 'master' of github.com:beginnor/beginnor.github.io
1
Merge branch 'master' of github.com:beginnor/beginnor.github.io

Conflicts:
	_posts/2014-11-14-use-jetty8-in-myeclipse6.5.md