new articles
Merge branch 'master' of https://github.com/Noxoomo/nlp-compscicenter-2014

Conflicts:
	.idea/workspace.xml