wat
Stupid conflict is stupid.
Merge branch 'master' of https://github.com/herp-a-derp/PornGameParser

Conflicts:
	Parser.as