141218_Unterricht
Merge branch 'master' of https://github.com/jonasschuele/MarkovArray

Conflicts:
	MarkovArray.xcodeproj/project.pbxproj
	MarkovArray/main.cpp