article class
Merge branch 'master' of https://github.com/braboszcz/PNAS-Meditation-Gamma-Article

Conflicts:
	newformat_article_neuron.tex