Mastery and item parsing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/libOL_test/main.cpp
Clean up
Don't depend on assert statements
Merge pull request #2 from satan6/master

Adds mastery and item parsing