started merging
more for merge
fixed Merge Problems
Merge remote-tracking branch 'remotes/github/joinExpAndStart'

Conflicts:
	css/ArticlesWrap_css.css
	js/jqueryLoadMoreBlocks.js
	templates/header2.php