Back to reading wikipedia :)
	modified:   NLP/build/Makefile
	new file:   NLP/build/backend
	modified:   NLP/build/exec
	new file:   NLP/build/main.cpp.o
	new file:   NLP/build/matrix.cpp.o
	new file:   NLP/media/wikipedia.txt
	modified:   NLP/src/main.cpp
	new file:   NLP/src/readWikipedia.py
Changed web folder to php folder to comply with OpenShift (I think...)
Forgot to add the new folder...
Merge branch 'master' of https://github.com/killmous/micro-news

Conflicts:
	php/index.php